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