diff options
author | Baligh Uddin <baligh@google.com> | 2016-06-08 13:34:48 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 13:34:48 +0000 |
commit | d3ae6447c88087da91573ddbc1f03b6a1dd1c55d (patch) | |
tree | 0ef8fc02ce649946870d40c3165541ad854ae35d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b880af58f2f54b9a493de25da60c8c3f77a30b5c (diff) | |
parent | e44803dc379833f99e99c7dcaba13717a4509642 (diff) |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 002ccec5c1 -s ours
am: e44803dc37 -s ours
Change-Id: I37cd6967159c29d209e1f97a750d9d8508fcd466
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions