diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 13:11:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 13:11:30 +0000 |
| commit | c6b88c0662c4b5b894629b517624b03deb08cb1b (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b8d140375c068ed3010e1abc9e607bccd15efbc3 (diff) | |
| parent | 70c9ae224c051c572dad93c9da267a3a6a30f821 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e18dc3c379 -s ours am: 70c9ae224c -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419992
Change-Id: Ia7948369bb5cd915e8e12dcd0f7c3e2361f3c3c2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions