LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of c6dc2830 to jb-mr2-dev

Browse Source 
Change-Id: Ia4e83de02c3f6d04523f52ca9586bdb217d9084c
This commit is contained in:
Raphael Moll
2013-03-22 11:09:16 -07:00
parent 3f5b02ec32 c6dc283043
commit 8a8a3025bb
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/sdk.atree
View File

@@ -37,6 +37,7 @@ frameworks/base/docs/docs-redirect.html documentation.html
# Platform Tools Component # Platform Tools Component
############################################################################## ##############################################################################
sdk/files/sdk_files_NOTICE.txt platform-tools/NOTICE.txt
development/sdk/plat_tools_source.properties platform-tools/source.properties development/sdk/plat_tools_source.properties platform-tools/source.properties
# host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/ # host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/