diff options
author | Bill Yi <byi@google.com> | 2016-07-12 16:29:28 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 16:29:28 +0000 |
commit | 4ae2cc38033c36b99fc66897fb7282e03d7508eb (patch) | |
tree | 9af3ef1b159595d0e3f48284bac5fe44dee9955a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b7c43bc613c953957db085ebd4747097f9ed0a18 (diff) | |
parent | 84c67fa3047fc6918a1ccb3aff228ca001eead88 (diff) |
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 84c67fa304 -s ours
Change-Id: I8da6418636bc11f64c226c8c3d995f7440ed04f7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions