diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:23:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:23:07 +0000 |
| commit | 95d691316cfdc34db4946428885ce8380ca26676 (patch) | |
| tree | 9a07c1d4a636852b7bc18027a8836e42b41d1eae /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 545affd91cf205707573c3b3d76dda3d7fe6bf8a (diff) | |
| parent | b419dee7d62173e74ee5dad3fdf8523ace01f325 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8adc4f7f3f -s ours am: e9ae85a025 -s ours am: b419dee7d6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086570
Change-Id: I8fa4c6025bb3e91030550965ce78a0e357b14ec9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions