diff options
author | Josh Gao <jmgao@google.com> | 2021-02-05 21:13:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 21:13:20 +0000 |
commit | b4d05a90e9e5a44174536c2635ac0d142638e64c (patch) | |
tree | 0185a670547e9bea0c3b11e1944ba2cc13194512 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ce39bfb3c1326fe240eab714e508cec6b2e5b0f2 (diff) | |
parent | 4359428db3ead1b776221f5f796affabfea2168e (diff) |
Merge changes I8b85d8ee,I789f41f1 am: ddaf564365 am: 4359428db3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566718
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22b7d2e823d131944d5b02996b8e3e92d2bbc2fa
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions