diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 12:52:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 12:52:44 +0000 |
| commit | edf72b98a635aa0ed1bf36fe499a8d21c363c1af (patch) | |
| tree | 1f4a2804775783cfd68af4135a20a5c2424b674f /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 08e1fc6b97becabe6434013745c0c98537c6b67a (diff) | |
| parent | 53e36247a95d44e394d606b10ded70f5f873adf1 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c06 am: a9c08f4361 am: b2e6bdfcdb -s ours am: 1411e29a3e -s ours am: b91616178e am: 85597ef797 -s ours am: 53e36247a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232
Change-Id: Ia1c1aa38de7dabcd2ef723704c57b5cfefb58d84
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions