diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-02-08 17:46:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-08 17:46:42 +0000 |
| commit | ed6a63240fc3c22a727c06214eb53117edb83f8a (patch) | |
| tree | e338f17dab2bb57fcb6086bdfcf6d7dd9901ae1a /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 97bd8baafb9db6a13bb2d957d35195ebb5da9a11 (diff) | |
| parent | 2fffbcb7dfafdb61e2f0265e8265f66985c63147 (diff) | |
[automerger skipped] Merge "resolve merge conflicts of a13fc7f314ac56e75eca09c94db8090f928023ff to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0f0 -s ours am: 2fffbcb7df -s ours
am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea7448 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13464421
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic1b9ce053c64fc31c03ce0f984b25480de0eb52c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions