diff options
author | Bill Yi <byi@google.com> | 2016-08-12 10:51:37 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-12 10:51:37 +0000 |
commit | d4d3503d57f69fb9e98b2538141f7fb481539eb1 (patch) | |
tree | a0056c94189714112f323a7d8e53ce6d52ae2d02 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4415f7ceca0182da14e86d78dadc24934ebda086 (diff) | |
parent | ccd9ff6157a7cd60ce9aa6cfd4828dcadfbca053 (diff) |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: ccd9ff6157 -s ours
Change-Id: I2191e7d4670a9852c72bf18cef1513cd7236ee80
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions