diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-06 07:49:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-06 07:49:36 +0000 |
| commit | db6ce327a0d177f23266e38ce2c7dda434c8cceb (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6394530395dd53a1f0a27b674cf0c1048f8c21e1 (diff) | |
| parent | 113ea77b05cf97285ff8276993e6e7a3b06f09d3 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e012e327c7 -s ours am: 5530f09269 -s ours am: 75cec2db9e -s ours am: 69098857dd -s ours am: 113ea77b05 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420005
Change-Id: Ifd3117ac841ed17d24011d0a0c6e0169a3584dd4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions