diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-04 14:04:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-04 14:04:40 +0000 |
| commit | af90ab4281757e8a8a66227cb32228be3adc1f9e (patch) | |
| tree | 5221c61b34d6950a218b6b77989149974cda0c12 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 882d3e882556a7a6e018acbfc70a0b0645a528b5 (diff) | |
| parent | 89e6200f279c81b32fb24c5e2be72e7eafab1816 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 898c9c063b -s ours am: 89e6200f27 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13167557
Change-Id: I7d2a2076f159040a902cc623c6c3e0833b2dbc18
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions