diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-01-25 23:33:35 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-01-25 23:33:35 +0000 |
commit | 4032a0d2859706aab56e8c32e6c27b4be0be132e (patch) | |
tree | cddcc3e030137a8f1fd5e16a339b31f34fade1bd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3dbd23e4fefc5299e8838a8214331c3dd44c318c (diff) | |
parent | fd1f0742b7146a32bd5f26d68d54b604fd902666 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 407d338837 -s ours skipped: 6ad3912399 am: 7e0d93a69b -s ours am: dba446b7a3 -s ours
am: fd1f0742b7 -s ours
Change-Id: I37e9454080f4ed4766ccfd69594106ee48a64638
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions