diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:29:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:29:03 +0000 |
| commit | ab2defbe0aa649506550d62bb442f66255dbf56e (patch) | |
| tree | 3905411e667d2ff53356e06be0d975bfd0957e9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 191ab79cd7fc6aa34747629b1e3d7c83aaae090e (diff) | |
| parent | b4fd8a32496a515f42daba4b19b64887f0282b92 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 97455bb190 -s ours am: f8c9fc05fc -s ours am: eec3cdbd5c -s ours am: b4fd8a3249 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12077356
Change-Id: I024f684560e3f3e45840e05767dac90bfcd4275e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions