diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-18 08:04:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 08:04:28 +0000 |
| commit | c24a85cc41f1eadc4d8f5f4db3e13103b196ae03 (patch) | |
| tree | ac790e097d5d1c43ab2ff44f09a5fa48748c6c51 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0e91b2e558fe066b1e0d087cf866118a7b296435 (diff) | |
| parent | 6083500783c119c8be2de6e07321fda989e4e737 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 851960cdd1 -s ours am: cb2bff1f62 -s ours am: f308ec62f2 -s ours am: 6083500783 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12184423
Change-Id: I5ec097e862de13f0ffbe3b02910804c9f9bc4f4c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions