diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:56:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:56:17 +0000 |
| commit | db8b134510567972d4a8f68598529ae84f095085 (patch) | |
| tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f1bde7bba3ab2be28b548aa003704f2a9c053d85 (diff) | |
| parent | 5f470bae4aa80c5850730c3c5e5964d25216e4ae (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4f9abbfb58 -s ours am: 5f470bae4a -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519377
Change-Id: I921594e944c4ba039c160dca37466ee7b32775d4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions