diff options
| author | Hall Liu <hallliu@google.com> | 2020-07-23 20:29:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-23 20:29:55 +0000 |
| commit | 01f398db165e09cd6b3352f6fa3a496776bad819 (patch) | |
| tree | 022e7b593bf78572be0f9dc5b00bbe3d3d24dc39 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 50015ad61291a0dd69d3cc834330754acebcad9b (diff) | |
| parent | cbf30830bc168382e1ac7c307bb1fcc3d6e9d908 (diff) | |
[automerger skipped] Merge "Skip carrier priv check for trusted UIDs" am: df9bf16543 am: cbf30830bc -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: Id32446478423ee72330762e01039d0d6ca8555c4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions