diff options
author | Bill Yi <byi@google.com> | 2016-06-27 17:52:36 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-27 17:52:36 +0000 |
commit | 83260aae7d612b7336589a3f0b75ce0d7906f3f6 (patch) | |
tree | 2394f9f5f16ea909ce688727f6ec2f81b6591c05 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 23f0ee01c98017ba302e9fbe60d385d11d741490 (diff) | |
parent | 9fe8474ec71a765306ec9212ee0350f356aa9210 (diff) |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: cc67847367 -s ours
am: 9fe8474ec7 -s ours
Change-Id: Ia239f70ab7d300e982d12a25c135866fe7f8898c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions