diff options
author | Baligh Uddin <baligh@google.com> | 2016-06-08 13:22:45 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 13:22:45 +0000 |
commit | 88d5f5eda04444c4de48f924faeeb4d3138bb177 (patch) | |
tree | 0ef8fc02ce649946870d40c3165541ad854ae35d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 982f0d4a3881147c5e47dc5ec83ff5b09001a5ec (diff) | |
parent | 25ad61262e37781df3180f28582d596e7d4766dc (diff) |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 64d6fddc4b -s ours
am: 25ad61262e -s ours
Change-Id: Iee43526b198d33f10bafde6136de850997fb8284
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions