diff options
author | Bill Yi <byi@google.com> | 2016-07-14 20:31:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-14 20:31:54 +0000 |
commit | e9de42ac9c18a4319aa8b29750c7a526364fa964 (patch) | |
tree | 1e898a52e76cc791888d1cd1a5aeba21a2c44dde /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a98d09462a91af79d121d3359df20ed8ac3ce61d (diff) | |
parent | a035048d358b99b129c428c326f06cbbb50fef2f (diff) |
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: a035048d35 -s ours
Change-Id: I233dad03d066fea8fd951247360e687f4c2ae84c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions