diff options
| author | Sarah Chin <sarahchin@google.com> | 2020-07-23 20:44:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-23 20:44:50 +0000 |
| commit | f0dd086772e075d0c669825ca0428753981a2145 (patch) | |
| tree | 409a78ecb7e09bb6738663a2ffd132b6e872fc06 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | b186145fcff7818a23a1b76e189a450a6a8f1c9f (diff) | |
| parent | 8683d3daa59206eb470b223622f495e4a28eb2b7 (diff) | |
[automerger skipped] Merge changes from topic "phone_info_5g" am: 20c0cd6b4c am: 0cb19b5ea5 am: 8683d3daa5 -s ours
am skip reason: Change-Id Ie709cad1c94ad204c46a559d316f45da16c3541c with SHA-1 33e5841e87 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371137
Change-Id: I883b781a825eba8a305cc5ee544a8a8891e0a2ea
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions