diff options
author | Frank Li <lifr@google.com> | 2020-06-23 01:58:33 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 01:58:33 +0000 |
commit | 5a5a6b9637f123f2d82ba438e8c9d5ae4e4acbf1 (patch) | |
tree | 41f2abaf3241ddecd05b857e8a0c254a7c4c9429 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 48ea01b43df105cee31c088f79e86ef04007daed (diff) | |
parent | f593ec5672797a40306116cce3f2c556c8f095fa (diff) |
[automerger skipped] Merge "Correct the name of enum UserType item" am: 51af7130bf am: 9c01d142fc -s ours am: f593ec5672 -s ours
am skip reason: Change-Id Ibefb4a9c03ae0bf3ea9cd2ce186223860aa42e74 with SHA-1 ad14a26c2c is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345374
Change-Id: I8d645b01be7245e989707f5f89ba2d458a0ce81a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions