diff options
author | Baligh Uddin <baligh@google.com> | 2016-06-08 13:22:44 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 13:22:44 +0000 |
commit | 9d70a4c5ae162e8f522198e8cb5dba6afad3e7b4 (patch) | |
tree | 0ef8fc02ce649946870d40c3165541ad854ae35d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 36a7fab7902b31d9eea5cef1342955f6c3119ae8 (diff) | |
parent | 064464251f990f4f97e445c3a13b5bf800eb0c7f (diff) |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: e573989e05 -s ours
am: 064464251f -s ours
Change-Id: Ie4c5dd34b8ed1f7202fc75ee7fad54d3c8cc1338
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions