diff options
author | Junyu Lai <junyulai@google.com> | 2021-03-12 08:24:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-12 08:24:46 +0000 |
commit | f263dba0430cb1bc29c779b4990f533996b3dc6b (patch) | |
tree | 1facb6dd2b6422b29f7531b458edf18cc6593994 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 0659f32f4ddadad263e9cabb017fb6e7b8a4413e (diff) | |
parent | caa3ffacfed47efcaa68681ec1c699bd6c14b802 (diff) |
Merge changes from topics "vcn04", "vcn12" am: 36b03734ef am: caa3ffacfe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iae13465b19d5245782cded0d01ff1b39617c8ac8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions