diff options
author | Bill Yi <byi@google.com> | 2016-06-20 19:22:41 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 19:22:41 +0000 |
commit | fbcadc61613c4a138bd2112b5ff58b77f8ce578f (patch) | |
tree | 8ef2e9d1556feefce766e02bb4cf25a5d770e50e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 550a7f64f38a7d84eec3dafdc5c5619996b0c2ac (diff) | |
parent | 712edd36aa4efdf9319065e72f87cfb43b0a242b (diff) |
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: a69a9bdc1f -s ours am: ddc101ee51 -s ours
am: 712edd36aa -s ours
Change-Id: I2b23c15674a0bfa365401134367621371be48ed5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions