diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-20 20:29:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-20 20:29:32 +0000 |
| commit | 6b12a5fea1e8799496f61bf02f927839038b3f33 (patch) | |
| tree | d7c700957eb773c893e7e9f144b10b705ccd6e58 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ed3b42539a4d883533177d008c7ffb2a58e50af6 (diff) | |
| parent | 5038b92e6adae454feb6095092bdaff80ecf1db3 (diff) | |
am 5038b92e: (-s ours) am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '5038b92e6adae454feb6095092bdaff80ecf1db3':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions