diff options
| author | Lucas Lin <lucaslin@google.com> | 2021-03-25 13:06:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-25 13:06:52 +0000 |
| commit | 8750dd182e5fb892edc3962a2c68e4deef38efe1 (patch) | |
| tree | d471fdb0b649005fd012afaded7c71635987eb0b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ce093c913fcb7fff71a21dd6e81a8d8a9b970646 (diff) | |
| parent | b96e8a1c551c5772616dd147c24aff1a3de16e8b (diff) | |
[automerger skipped] Merge changes I6d5dd0a8,I106b3e4f am: 276f8e6a70 am: db4eb02ecd am: b96e8a1c55 -s ours
am skip reason: skip tag Change-Id I6d5dd0a8c3879df7bdc1d58e36022045c303bb40 with SHA-1 83ca710aff is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653932
Change-Id: I3d8237e0619f7a63e3290609b9c9158d47d5830d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions