am 8a8a3025: resolved conflicts for merge of c6dc2830 to jb-mr2-dev

* commit '8a8a3025bb570a8ea526e6754bc680dc7f015140':
  SDK: Place platform-tools NOTICE file in proper directory.
This commit is contained in:
Raphael Moll
2013-03-22 18:14:25 +00:00
committed by Android Git Automerger

View File

@@ -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)/