diff options
author | Geoff Mendal <mendal@google.com> | 2015-11-04 18:24:14 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-04 18:24:14 +0000 |
commit | 6df893939e765d910748cfd8a42473793919e9f3 (patch) | |
tree | bc6f95e4d83b6c0a4489b91cb8303d3240d1cba3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 891e52ba296a33d0e51befa209c1ce14a2746991 (diff) | |
parent | c5b905f50069233c2769352a0614605b3ad348f8 (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8e7ab07ce7 -s ours am: cbe037b01a -s ours
am: c5b905f500 -s ours
* commit 'c5b905f50069233c2769352a0614605b3ad348f8':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions