diff options
author | Baligh Uddin <baligh@google.com> | 2016-06-08 13:22:56 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 13:22:56 +0000 |
commit | cb7940252ada4d739eb4cb815fee2f41f042e5f4 (patch) | |
tree | 0ef8fc02ce649946870d40c3165541ad854ae35d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 41bbe4f26316c104398c670330deecb84af34525 (diff) | |
parent | 5b96cafec832787b2780c200457ef075fcde013d (diff) |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: e573989e05 -s ours
am: 5b96cafec8 -s ours
Change-Id: Ib4cf72599b34dc9b29f8765d202e62bf4928a7e5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions