diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 17:53:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 17:53:21 +0000 |
| commit | 11d0c95fd08b2c125496658eace4a8f8fa3c3857 (patch) | |
| tree | cade9d6f17d984a1d175b8c1e74e2a13f8aa2df7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4c280b8d31f25a955660644a2cab7971a1ada92f (diff) | |
| parent | 40baa2365da27232350f363fcacaf0e3dd50ce0f (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours am: 22810521eb -s ours am: 5d3e2c1e42 -s ours am: 40baa2365d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087182
Change-Id: Ie3489b69656ea847f53f47b36585ea38c0cb9ea5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions