diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-02 14:36:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-02 14:36:17 +0000 |
| commit | 828e0f78b30f98eb37dd30eaa49d03b96c37ab89 (patch) | |
| tree | 79a8e1fa0dd214e57a722dc98a1bbb736a9d2a3f /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | d866fa0490ef65b97059e97e32e4285b7f64049c (diff) | |
| parent | e80017ab4422c67e2565e53869d0cfc6a70b966d (diff) | |
am e80017ab: (-s ours) am e4679922: (-s ours) am fe780774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'e80017ab4422c67e2565e53869d0cfc6a70b966d':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions