diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-01 22:16:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-01 22:16:19 +0000 |
| commit | a971ec414ed23b50f457483be1b14f745e193a9f (patch) | |
| tree | 570234d76d7b4aa6f4914363773312f54fc67f46 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | d56c04ba43cc28d3e29bc5ba0bb86cd0b960cd51 (diff) | |
| parent | 295b8778c8254f49af684ed96b880507378577f6 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into oc-dev am: 2ffbce4ef6 am: ee56d71633 am: d6d7f518cc -s ours am: 55fa3101de -s ours am: 7eb69864a3 am: 295b8778c8 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie6a2c925545a2b9d52c36ab5122c7098bb076f5b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions