tree 9cd8ce8562a511a8138a23edd7a14d1eb7ea154e
parent 70afd77e62d76d5350e6db96253407b4e7a52c6e
parent 6b32d3e119bef9e53929316756f1e7931a831248
author Bill Yi <byi@google.com> 1502087821 +0000
committer android-build-merger <android-build-merger@google.com> 1502087821 +0000

Import translations. DO NOT MERGE am: 4877fa47dc  -s ours am: 79b752fdf0  -s ours am: eae788b054  -s ours
am: 6b32d3e119  -s ours

Change-Id: Ibbb1b07c6c6c8938c6e75dcafbcfb1133b4152f7