diff options
author | Cody Kesting <ckesting@google.com> | 2021-02-05 18:18:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 18:18:54 +0000 |
commit | e787af138289583d979c46022dcf65792acc34a4 (patch) | |
tree | 3eaa96305748818938f2fbbc7e1a03452ef86b35 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 875dbcfb509e1a4a11d4ffa85d28de1321054af9 (diff) | |
parent | c241564e16ac0c71c8694ff16df99211cf50e5f0 (diff) |
Merge changes I128a894c,I3336c150 am: 9a5b717514 am: a6d1cd266c am: c241564e16
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574505
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2efcbc2aec641b0feddc36ca70786547c637aa4b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions