diff options
| author | Cody Kesting <ckesting@google.com> | 2020-12-08 20:09:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 20:09:37 +0000 |
| commit | 8e3ec4343d78b037a1f3dd05a42300ec91c2f290 (patch) | |
| tree | e0cdfbc48c6bb54949b6ce22d090a1ae4f06c07c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e0baa9203051d9d11db8ae064ad41abb72aa6f75 (diff) | |
| parent | 6fc2b58db285da72ba0dd0db6626a0fff6c82035 (diff) | |
[automerger skipped] Merge "Allow the System UID to unregister ConnDiags CBs." into rvc-qpr-dev am: 07dd48319d -s ours am: 6fc2b58db2 -s ours
am skip reason: Change-Id I20d0cad5f902708d366aa703c2893b0ea3e55052 with SHA-1 4248f22f18 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13169565
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I766b99d3fdba7eb7a556adf808e5041ad70a7a51
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions