diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-19 18:17:26 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 18:17:26 +0000 |
commit | 3b020019dd10f0a5124845f55bdff4d3a99378d7 (patch) | |
tree | cd16f63e49e7e644433abd1c5ffd1c3a780bee73 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 66a4d1eaaa9d3ab79d65c812c8c80a51538b1ce9 (diff) | |
parent | b91fa39075e466f81748b2c69f2c1189a41d3bbf (diff) |
am b91fa390: (-s ours) am 2434a36d: (-s ours) am af0c15d7: (-s ours) am 4cfcdac0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'b91fa39075e466f81748b2c69f2c1189a41d3bbf':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions