diff options
| author | Geoff Mendal <mendal@google.com> | 2015-05-02 04:47:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-02 04:47:54 +0000 |
| commit | d6a9daa65e9237914f8877fd6d9a6965e1e39147 (patch) | |
| tree | 7472d0390720ae8335df161e681ed1a3a40d3f53 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fe96c1891e42a408247ff6bf8827b3c8ffb68f83 (diff) | |
| parent | 44acc73e6cf52635f79297232f6f2d18900bf77f (diff) | |
am 44acc73e: (-s ours) am 6b27f789: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '44acc73e6cf52635f79297232f6f2d18900bf77f':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions