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