summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-05-11 17:05:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-11 17:05:41 +0000
commitb6ef3454bd02d95dfbb1be8fdff25d27199faef8 (patch)
tree7c1633dca74b3d4de8a31e9fa0cef58ae99d4f43
parente9be2803270d95b7d2b65fad620fdab64ee7ae8b (diff)
parent1938444d6c845344b9259e076db4c75f6f688343 (diff)
Merge "Fix the path of boot image profile and preloaded classes for frameworks." am: 0e52d9c6f9 am: 43927fdefc am: 1938444d6c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1698770 Change-Id: I5524625c2c15bea22613ce7d8ed842cd355139a1
-rw-r--r--boot/boot-image-profile.txt (renamed from build/boot/boot-image-profile.txt)0
-rw-r--r--boot/preloaded-classes (renamed from build/boot/preloaded-classes)0
2 files changed, 0 insertions, 0 deletions
diff --git a/build/boot/boot-image-profile.txt b/boot/boot-image-profile.txt
index e69de29bb2d1..e69de29bb2d1 100644
--- a/build/boot/boot-image-profile.txt
+++ b/boot/boot-image-profile.txt
diff --git a/build/boot/preloaded-classes b/boot/preloaded-classes
index e69de29bb2d1..e69de29bb2d1 100644
--- a/build/boot/preloaded-classes
+++ b/boot/preloaded-classes