commit fcfe9d84189423fbe93d1ef4651ca9696bb7902f
author Mathieu Chartier <mathieuc@google.com> Mon Aug 14 16:53:12 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 14 16:53:12 2017 +0000
tree 35977286ea166024ec15e1e241fd9311cc7fef9f
parent 66042e0caf4c2eeb2dddd62cd6464b25f6aec718
parent a023b86c3b4554b90ed6edfd63cedddb4f0100f9

Merge "Add frameworks base config and move text blobs there" into oc-mr1-dev

config/compiled-classes-phone

diff --git a/compiled-classes-phone b/config/compiled-classes-phone
similarity index 99%
rename from compiled-classes-phone
rename to config/compiled-classes-phone
index d11f0ba..548dc38 100644
--- a/compiled-classes-phone
+++ b/config/compiled-classes-phone
@@ -26,7 +26,7 @@
 # to your device.mk, e.g.,
 #
 #   PRODUCT_COPY_FILES += \
-#     frameworks/base/compiled-classes-phone:system/etc/compiled-classes
+#     frameworks/base/config/compiled-classes-phone:system/etc/compiled-classes
 #
 android.R$styleable
 android.accessibilityservice.AccessibilityServiceInfo

config/dirty-image-objects

diff --git a/dirty-image-objects b/config/dirty-image-objects
similarity index 100%
rename from dirty-image-objects
rename to config/dirty-image-objects

config/preloaded-classes

diff --git a/preloaded-classes b/config/preloaded-classes
similarity index 100%
rename from preloaded-classes
rename to config/preloaded-classes