diff options
author | Cody Kesting <ckesting@google.com> | 2020-12-08 19:52:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 19:52:11 +0000 |
commit | 6fc2b58db285da72ba0dd0db6626a0fff6c82035 (patch) | |
tree | 048436916603992d535c3645ae5bfd37295c0465 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 358f0d4fc8c248498cf113c41e043877a14e89a1 (diff) | |
parent | 07dd48319dc3f3429c9ae2565b6fb22f907f2b0f (diff) |
[automerger skipped] Merge "Allow the System UID to unregister ConnDiags CBs." into rvc-qpr-dev am: 07dd48319d -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: I9cdd7edda3f94d66aa7e0bdc6daaaf5a08b360c0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions