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

resolve merge conflicts of 3189854 to stage-aosp-master

Browse Source 
Change-Id: Ia445d8ecf85ce655862194a21b322457c38471ee
This commit is contained in:
Chris Craik
2016-08-23 10:24:46 -07:00
parent b3406c933a 31898546df
commit 1dd320ea93
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build/sdk.atree
View File

@@ -57,11 +57,12 @@ development/sdk/generated-api-versions.xml platform-tools/api/api-versions.xm
prebuilts/sdk/sdk-annotations/annotations.zip platform-tools/api/annotations.zip
# systrace
external/chromium-trace/catapult/systrace/systrace/ platform-tools/systrace/catapult/systrace/systrace/
external/chromium-trace/catapult/systrace/systrace/__init__.py platform-tools/systrace/catapult/systrace/systrace/__init__.py
external/chromium-trace/catapult/systrace/systrace/agents/__init__.py platform-tools/systrace/catapult/systrace/systrace/agents/__init__.py
external/chromium-trace/catapult/catapult_base/ platform-tools/systrace/catapult/catapult_base/
external/chromium-trace/catapult/common/ platform-tools/systrace/catapult/common/
external/chromium-trace/catapult/dependency_manager/ platform-tools/systrace/catapult/dependency_manager/
external/chromium-trace/catapult/devil/ platform-tools/systrace/catapult/devil/
external/chromium-trace/catapult/systrace/ platform-tools/systrace/catapult/systrace/
external/chromium-trace/systrace.py platform-tools/systrace/systrace.py
external/chromium-trace/systrace_trace_viewer.html platform-tools/systrace/systrace_trace_viewer.html
external/chromium-trace/NOTICE platform-tools/systrace/NOTICE
external/chromium-trace/UPSTREAM_REVISION platform-tools/systrace/UPSTREAM_REVISION

3
build/sdk.exclude.atree
View File

@@ -20,7 +20,8 @@
-.*.swp
-.DS_Store
-*~
-_*
-_[!_]*
-*.pyc
-.*
-OWNERS
-MODULE_LICENSE_*