diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 01:13:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 01:13:07 +0000 |
commit | 29d443ad71b95d737d8fb54bd5308f97e72a4edf (patch) | |
tree | 4328f5fe526be6abbc21d75730b132fbdc95d5f7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1a0da78f587aa05495b23ecb7f5ae93defa56ba0 (diff) | |
parent | 6b2d93cf8aeb1633c0c9d5acaf4b9bbed16f1aa7 (diff) |
Merge "Move Lockdown to second place, after Emergency" into rvc-dev am: e38716c6a7 am: 6b2d93cf8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920904
Change-Id: Iadf2ec0f68d9bbb52b2173f373f584cc847b6f2f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions