diff options
author | Kholoud Mohamed <kholoudm@google.com> | 2021-03-31 12:07:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-31 12:07:47 +0000 |
commit | 89096eea168d56a5b87ce6a4d14a9fc10d514ab1 (patch) | |
tree | 94ab53fd1a354f436125ac8b64c81f41f58a006f /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | cede72579525bf182214db05defb88c22bee767a (diff) | |
parent | 5efda0886dd5b8711135a2ebde5d95d801253f87 (diff) |
[automerger skipped] Merge "Create new permission QUERY_AUDIO_STATE" am: ddf5a7dc62 am: 06179bfbd8 am: 5efda0886d -s ours
am skip reason: skip tag Change-Id If1bfcb1341402717fec74cc704caa7e1eb18fa2e with SHA-1 63a2278e0b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652850
Change-Id: I2f37b3fe1856c47cbceeb52893c828bbc1509e9b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions