diff options
author | James Mattis <jmattis@google.com> | 2020-12-22 06:57:02 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-22 06:57:02 +0000 |
commit | 94e631e3ccc27ca01f7ecc9ac02717d0eaf08437 (patch) | |
tree | 67f52adb65da989558cfb08dd6a40fc4f791ec18 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e61415d6d9cbab7b4ce85c93e1ad5e770aa95500 (diff) | |
parent | fc0d3cf55338fe8dd2e142a445682663511f2cb7 (diff) |
Merge changes I177ec607,I68f364b4,Ib3b9f52c,If040d61e am: 87eadad550 am: 327f96aa66 am: fc0d3cf553
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1507701
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id8d45a68283ab29f6928628ebf852143793aff76
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions