tree fccd8bdff8a200077e4e78badd1abc1ef6ed90c6
parent 11ca09d52a7b711a65b7fc734e5c7a0bed373764
parent 9ee7b1f6eec12939eb47847e5600c9c114d6a889
author Bill Yi <byi@google.com> 1470781827 +0000
committer android-build-merger <android-build-merger@google.com> 1470781827 +0000

Import translations. DO NOT MERGE am: f94915ecff  -s ours am: 22cbb12e04  -s ours am: d7864dcef8  -s ours
am: 9ee7b1f6ee  -s ours

Change-Id: If8129d533e04006f3a706648dce1283ff60cfcf6