diff options
author | Tianjie Xu <xunchang@google.com> | 2020-12-15 00:36:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 00:36:01 +0000 |
commit | d4dbfe6bf8eba93031c57e41c3714e00ab7317fd (patch) | |
tree | e222f2c0f6190881fea77deadfd439b6251a8a6d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4b0feafeac5c060a5fdc33a00c0cbda18694be31 (diff) | |
parent | 2fd269494a121722dc37a20e7a591de3de4dce3f (diff) |
Merge changes Icf10d577,Ia9d3cae7 am: 6083210d17 am: a258be9df5 am: 2fd269494a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519582
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iee05827a112e9ea8a6ab29fb7c00cea8e8b8a9bb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions