commit | 82a42d5465a69bf2524bd8934b34a341a2ac6c99 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Dec 30 10:48:22 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 30 10:48:22 2016 +0000 |
tree | 6cfd084ef6cf26e1c14ea7f06cfc6429c6bf879d | |
parent | 8f9a3154c76ca5538d72b8c64d246f617d04dfcc [diff] | |
parent | 1efc31d6a6bc1fdbca2c92aa6660df08fb4ad86e [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 7ad5111905 -s ours am: 1efc31d6a6 -s ours Change-Id: I8a050bf598ec6de7a6d0138bba5bf0dd313821b3