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 | 982f0d4a3881147c5e47dc5ec83ff5b09001a5ec (patch) | |
tree | 0ef8fc02ce649946870d40c3165541ad854ae35d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b2d7dc1edd87bc1d03b9ea6cbdf93cf517fecc35 (diff) | |
parent | 74323832def211b4889db7cece57246af6d8129e (diff) |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2d3c74a2fd -s ours
am: 74323832de -s ours
Change-Id: I89891b68d8175b457dd0be65a0a9ea7abe9d9db2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions