diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-19 15:46:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:46:54 +0000 |
| commit | aed9d3454b777be58bce3bfefa9c7300ae56801d (patch) | |
| tree | 7f69384acaac3e5b33676fa3a0f5529b3a041e80 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 40f2f52140a3e434a4cd9e53455fd99406af3ac9 (diff) | |
| parent | c1517c09d9ed3f67f9e9d003d2bb4ebc119916e6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: d3f766ee0f -s ours am: a1f3c2d016 -s ours am: 8d9d5c6fed -s ours am: c1517c09d9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12187676
Change-Id: I5458ee4650ba0bf72c52da55971804ccf9c574ac
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions