am 9a01c4c5: Merge "Install SDK annotations as platform-tools/api/annotations.zip" into mnc-dev

* commit '9a01c4c5cd45b977b2ae9c810b86502e4b645cc9':
  Install SDK annotations as platform-tools/api/annotations.zip
This commit is contained in:
Tor Norbye
2015-05-20 18:20:32 +00:00
committed by Android Git Automerger

View File

@@ -53,6 +53,9 @@ bin/hprof-conv strip platform-tools/hprof-conv
# API database for tools such as lint # API database for tools such as lint
development/sdk/generated-api-versions.xml platform-tools/api/api-versions.xml development/sdk/generated-api-versions.xml platform-tools/api/api-versions.xml
# API annotations database for lint
prebuilts/sdk/sdk-annotations/annotations.zip platform-tools/api/annotations.zip
# systrace # systrace
external/chromium-trace/systrace.py platform-tools/systrace/systrace.py external/chromium-trace/systrace.py platform-tools/systrace/systrace.py
external/chromium-trace/systrace-legacy.py platform-tools/systrace/systrace-legacy.py external/chromium-trace/systrace-legacy.py platform-tools/systrace/systrace-legacy.py