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