diff options
| author | Hall Liu <hallliu@google.com> | 2020-07-23 20:44:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-23 20:44:20 +0000 |
| commit | 8ecdd6b7b20323b87c445df8af55bf607a3960de (patch) | |
| tree | 409a78ecb7e09bb6738663a2ffd132b6e872fc06 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 7ee1dc7321243a6525c84e5a66acb9cda7cd912b (diff) | |
| parent | 01f398db165e09cd6b3352f6fa3a496776bad819 (diff) | |
[automerger skipped] Merge "Skip carrier priv check for trusted UIDs" am: df9bf16543 am: cbf30830bc -s ours am: 01f398db16 -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: I2bd0b66ae545b99c71d2cd4a94449aee25e69e75
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions