diff options
author | Geoff Mendal <mendal@google.com> | 2015-11-17 23:43:53 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-17 23:43:53 +0000 |
commit | 47bd2e68831a9c654c0caf17a99748b7b7db1c22 (patch) | |
tree | d562f732ae37710796d4031e8305c6671592e2c9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b33916de2ac47bc199dc6472a84953be509e9179 (diff) | |
parent | 6dff6bc8cde0f71752880b2495d65bd744c11060 (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 812794f0f5 -s ours
am: 6dff6bc8cd -s ours
* commit '6dff6bc8cde0f71752880b2495d65bd744c11060':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions