summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2020-07-23 20:56:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-23 20:56:34 +0000
commit0f91b64c34543d21657ddd149e6a7caa71761456 (patch)
tree9ea0f92bb81f5e593c4616395c45370171a140f8 /tools/aapt2/java/JavaClassGenerator.cpp
parent0ead0fc38293f10e50814b2ec141aaaca3cae56f (diff)
parent8ecdd6b7b20323b87c445df8af55bf607a3960de (diff)
[automerger skipped] Merge "Skip carrier priv check for trusted UIDs" am: df9bf16543 am: cbf30830bc -s ours am: 01f398db16 -s ours am: 8ecdd6b7b2 -s ours
am skip reason: Change-Id I1399cab579308479d7cf191b8795441cbcd3ff65 with SHA-1 12a3f5cfdc is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371497 Change-Id: Ibaa9d3443dc407b648e0524a3bc0e00c65e19f52
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions