diff options
| author | Bill Yi <byi@google.com> | 2019-06-24 09:14:45 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 09:14:45 -0700 |
| commit | 56b397e6b8e70b9b0311bf54096c6cb94e86b052 (patch) | |
| tree | 327813f3031b344a0b2c9348147e04e45434625e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7ceea6ceaf3a6d88a89f96fc330e9411a99478a5 (diff) | |
| parent | 12258e0a314691f652ac9ee857b5cdb5cab9a594 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c000487154 -s ours am: d1809212c4 -s ours
am: 12258e0a31 -s ours
am skip reason: subject contains skip directive
Change-Id: I81403bfb96618721d760fc9bae8226743c814c10
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions