diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-23 23:07:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-23 23:07:04 +0000 |
| commit | ce6987d2639697cbfb8bb7e7644ea74d2d5cf0cb (patch) | |
| tree | 51ade010f3736fc034c686c8f9f99bc596a08052 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2245082dbb5c83ad173fe40f307ef58a786650de (diff) | |
| parent | e769f7bf7dfe401d0a171e0ea09d1854f65bb5af (diff) | |
[automerger skipped] Merge "Adding LOADER_USAGE_STATS permission to shell" am: a5a04bbb4e am: e769f7bf7d -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: Ia058eb0b815aa9db5c98c1c6d66069fde208f2f9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions