resolve merge conflicts of 3189854 to stage-aosp-master
Change-Id: Ia445d8ecf85ce655862194a21b322457c38471ee
diff --git a/build/sdk.atree b/build/sdk.atree
index 68ca421..0e04192 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -57,11 +57,12 @@
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
diff --git a/build/sdk.exclude.atree b/build/sdk.exclude.atree
index 5a93b1b..479d79c 100644
--- a/build/sdk.exclude.atree
+++ b/build/sdk.exclude.atree
@@ -20,7 +20,8 @@
-.*.swp
-.DS_Store
-*~
--_*
+-_[!_]*
+-*.pyc
-.*
-OWNERS
-MODULE_LICENSE_*
