diff options
author | Xin Li <delphij@google.com> | 2020-09-11 00:40:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 00:40:06 +0000 |
commit | b9db5b54f60c278c461f802995dae305c1ac760a (patch) | |
tree | 1a679458fdbd8d370692d56791e2bf83acee35b5 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 2547a7380952cef9f70e569aaa2c0e421f37f7dc (diff) | |
parent | 8ac6741e47c76bde065f868ea64d2f04541487b9 (diff) |
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: I4556c20984240fd32561e6b70f772b94934e5908
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions