diff options
| author | Geoff Mendal <mendal@google.com> | 2015-01-16 20:58:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 20:58:28 +0000 |
| commit | fa1849df7b285430f1750a4d99182802c40e210e (patch) | |
| tree | c5d26b32ca341a6ae48469fde2d714f14ec716a7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c30e076875765dd0d79e62568920781b3f9e23b9 (diff) | |
| parent | eef5734d96cd05deab581cdcfebc61533fc25cf6 (diff) | |
am eef5734d: (-s ours) am 3891ce73: (-s ours) am 2c8e6daa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'eef5734d96cd05deab581cdcfebc61533fc25cf6':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions