diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-29 14:52:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 14:52:06 +0000 |
| commit | 402337396297961700cbfea25aac046816d87340 (patch) | |
| tree | 284abf1b499e7d841792ec98d27f29bf67b0175d /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 4d6e75cbfdb669f72889ea31bdc299cb3ce7f100 (diff) | |
| parent | 5ca3191a30430ffd3b86cee9c044bd93536aa0cb (diff) | |
am 5ca3191a: (-s ours) am 755e95a4: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '5ca3191a30430ffd3b86cee9c044bd93536aa0cb':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions