diff options
author | Geoff Mendal <mendal@google.com> | 2015-08-08 19:15:15 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 19:15:15 +0000 |
commit | c5378ab518dfd5e4258d36d71df3d78a0cb76cdf (patch) | |
tree | 0f635324aed1783b7cde395d5a0eda0eb29e74df /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | bf78963c5d852387a8ee81393838012d439d4ce9 (diff) | |
parent | 2c636248dd7e62c4f17c304df08eb73652d788fa (diff) |
am 2c636248: (-s ours) am e618963b: (-s ours) am 035e10f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '2c636248dd7e62c4f17c304df08eb73652d788fa':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions