tree 0b491d65092cfa935a9ddfd155067594d6f5988c
parent 889517b80bc704e07a5d5a850887ac62c125b553
parent 9fe8b8b663b99d0ba145f0e3afbc3c20de1d75c8
author Bill Yi <byi@google.com> 1467349789 +0000
committer android-build-merger <android-build-merger@google.com> 1467349789 +0000

Import translations. DO NOT MERGE am: 34e2854786  -s ours am: 93d2e08ef2  -s ours
am: 9fe8b8b663  -s ours

Change-Id: I07911aae8d7c9dbe1383072917ab52d314dfff20