resolved conflicts for merge of c6dc2830 to jb-mr2-dev
Change-Id: Ia4e83de02c3f6d04523f52ca9586bdb217d9084c
This commit is contained in:
@@ -37,6 +37,7 @@ frameworks/base/docs/docs-redirect.html documentation.html
|
||||
# Platform Tools Component
|
||||
##############################################################################
|
||||
|
||||
sdk/files/sdk_files_NOTICE.txt platform-tools/NOTICE.txt
|
||||
development/sdk/plat_tools_source.properties platform-tools/source.properties
|
||||
|
||||
# host tools from out/host/$(HOST_OS)-$(HOST_ARCH)/
|
||||
|
||||
Reference in New Issue
Block a user