diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:10:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:10:42 +0000 |
| commit | 2d8b9626983960a12d9ffb89b44e016a8899061b (patch) | |
| tree | 0ae3fd0d282bcaa8ed21ad7b1de7e018b19f4991 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | b419dee7d62173e74ee5dad3fdf8523ace01f325 (diff) | |
| parent | cce78f1da72e2885ba19d25064f0bc3ae219305c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 1cdb57b79a -s ours am: cce78f1da7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086566
Change-Id: I38ecdfdf2327e3ebed4bac3bf1d6c50dfbbdb1b2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions