diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 09:45:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 09:45:23 +0000 |
| commit | afee36a31fefdb470dc9aeeaa09e8c9b882adbb2 (patch) | |
| tree | 6bc1d197a89b4fc8733f35a0d78a7dde37e37be7 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 680f8a50391018976e8bd0ffce718b6890ccd048 (diff) | |
| parent | ce4bbdb4c587e84a94572efefd6885c5820c7d4a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8d1d77925d -s ours am: a6df809312 -s ours am: b5be1e3744 -s ours am: ce4bbdb4c5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12518498
Change-Id: I8c3d572c723334bd99c4bd33ad1e20e9075ced2d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions