diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-23 23:50:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-23 23:50:26 +0000 |
| commit | bb247be596a19dadb33dc54ec4e86f52b34fdea9 (patch) | |
| tree | d1e9c93be853ab61d30c561f6871b7a89cebffe8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e3ad82a25cd49695aa66622e89daa8266041bbf3 (diff) | |
| parent | ee5b713dcbf2cf642b96441e7238952b72ccc5fa (diff) | |
[automerger skipped] Merge "Adding LOADER_USAGE_STATS permission to shell" am: a5a04bbb4e am: e769f7bf7d -s ours am: ce6987d263 -s ours am: b511e22cf0 -s ours am: ee5b713dcb -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: I77c0dd9e19989d76ea352ea96c73557117d883eb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions