diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 18:23:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 18:23:04 +0000 |
commit | a50b6b31eed624c1dac8c7957fc542f5d5a51d2a (patch) | |
tree | 197d973cbabf56ee181d0916e5fcbf0005a25c3d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d88fcacbd1d9204cf337c3d35671e841a508a775 (diff) | |
parent | 6b7df7b723a0baa33bffbd34fcce3fdb0c9e4e85 (diff) |
[automerger skipped] Merge "RESTRICT AUTOMERGE" into qt-qpr1-dev am: a752bb777d -s ours am: 265548dfa0 am: 7edd80a2e8 am: 6b7df7b723
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11409576
Change-Id: Ifdca8975c3942f8f579ea503ec469edc5c400c90
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions