diff options
author | Bill Yi <byi@google.com> | 2016-06-03 17:12:33 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:12:33 +0000 |
commit | c29b39b95f545e4c585d67fed17e3c59f3ef901a (patch) | |
tree | 5e46eb197f768d83838afb7541ca9d1a01dda85f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 5c2575071e95e8efbb73f1a78f8dc382eda6e453 (diff) | |
parent | f79616b4277f477985f96f8a486126a389905c7d (diff) |
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: f79616b427 -s ours
* commit 'f79616b4277f477985f96f8a486126a389905c7d':
Import translations. DO NOT MERGE
Change-Id: Ia6869ed50d88aea53c3c42e02337eaecf1dd870f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions