diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 17:31:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 17:31:04 +0000 |
| commit | 5519d32d4be33da0e1a79d1513eaa199ab0fcc3e (patch) | |
| tree | 49812e2acb2bd5a636ba6fd91a2a89a9eb57d4c4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 22483664c91f6c4a069f511ba8cc4b7f661ddf91 (diff) | |
| parent | cd548ffab2c4e8b70080f1d8776c50ce272a27f2 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ea6d47bd95 -s ours am: cd548ffab2 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684627
Change-Id: I67fb31dd6bd621631ca030ef82ae39bf1fbe5038
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions