diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-23 23:22:02 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-23 23:22:02 +0000 |
commit | b511e22cf057902570931bc3186843b64ca9ca28 (patch) | |
tree | 619d135797adb31ce4b311dfe1e99e82b738b373 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a24c513ec933c4801e20155d5f938ba0fada21cb (diff) | |
parent | ce6987d2639697cbfb8bb7e7644ea74d2d5cf0cb (diff) |
[automerger skipped] Merge "Adding LOADER_USAGE_STATS permission to shell" am: a5a04bbb4e am: e769f7bf7d -s ours am: ce6987d263 -s ours
am skip reason: Change-Id I4f146337429679edddba698aa88bb9b2cb883ab9 with SHA-1 a2b2226d6b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326492
Change-Id: I59ff7a3ef9e6e35d7dc3539873322dcb9cd2ac26
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions