diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-01 21:37:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-01 21:37:59 +0000 |
| commit | 7eb69864a323f36662ed212541c82db98688710b (patch) | |
| tree | bf6b0f12f61258466ae8cd15e21300ddbdcfe2b6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1f6be626bfee45df9cd06d0d99908cfb80c5dd29 (diff) | |
| parent | 55fa3101de8c82210532bb137a414d3654af69ea (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 skip reason: subject contains skip directive
Change-Id: I4fabdde2e1250cc8162b9e1e78bb98a58c935383
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions