diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-23 17:42:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 17:42:40 +0000 |
| commit | 1584eefebd2de1bcce0e589ee6414df4bade07b9 (patch) | |
| tree | 938a6dd806ac939bd509c3bc130a58b1b0a4b196 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b89ac616a050fa5efd12c9d5e034bd8780d0446e (diff) | |
| parent | eb1e4b14c979b36abbd6869ee300ec69936afb55 (diff) | |
am eb1e4b14: (-s ours) am 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'eb1e4b14c979b36abbd6869ee300ec69936afb55':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions