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