commit | d56091256c445c8661810eaef4f56fdcbd89a7ee | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 03 17:53:33 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 03 17:53:33 2016 +0000 |
tree | 8f9ce470fa1e347d5e22af89f05b21ff88fed288 | |
parent | 21ea400657bc9f052e5189490b7193f754d83861 [diff] | |
parent | 166d6e92547de8985f131dd82db529a8ffe6e67a [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours am: 1bef62e488 -s ours am: 166d6e9254 -s ours * commit '166d6e92547de8985f131dd82db529a8ffe6e67a': Change-Id: I6eaef955158660328093e65ad1fe1dd3effc3047