diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 14:21:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 14:21:57 +0000 |
| commit | 0ee228aefa74e21ccaf381759255b31e63a4fcd3 (patch) | |
| tree | 8be6d8b7f5f97916f434112b59ec5685f0741a1e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e59e61bede59fa1765c91048a167b9eaa20331f1 (diff) | |
| parent | b54c69fdf392be683a3f983183337f066b50152c (diff) | |
[automerger skipped] Merge "DO NOT MERGE Bump up the max persisted uri grants am: 5a293b8eb2 am: 2654c4465e am: 230f15dde0" into rvc-qpr-dev-plus-aosp am: b54c69fdf3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105684
Change-Id: Ib6617fcda9abf5c680a1ccdf948130897477b7d2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions