commit | 2a9bf18182743823b2f38c13119f020c1d616925 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 03 17:43:54 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 03 17:43:54 2016 +0000 |
tree | 277720002bc21c9948a2146196c64f5c66b4d49a | |
parent | 3008905af3e4d5e7d7827014031a50188049638b [diff] | |
parent | 85e1b30a61c0da98a79ff6a5dc4faf0babd081e2 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours am: 85e1b30a61 -s ours * commit '85e1b30a61c0da98a79ff6a5dc4faf0babd081e2': Change-Id: Iebcf8d4966d03d0b6b6fae266f8e166f3c6cb4fb