diff options
| author | Geoff Mendal <mendal@google.com> | 2015-10-19 16:11:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-19 16:11:50 +0000 |
| commit | 0d662630dca28ade708669cdf1bc61e353ed56bf (patch) | |
| tree | e579f8dcea468848b4e2828a526acbc7bbffdc15 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9a6c8b84855bc3d2dddc580c3b2ae0c85c45ffd5 (diff) | |
| parent | 06efcdc6bed934ac3c138a380728f6b11e051f28 (diff) | |
am 06efcdc6: (-s ours) am e0f00d04: (-s ours) am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559 -s ours
* commit '06efcdc6bed934ac3c138a380728f6b11e051f28':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions