tree b517a5eaac9368ca6ed652055c8c97222da11954
parent 9b9734500248a98e1bfd9ea84b91da72f7d5824c
parent 15eb6049a6b9a5737cc5290d527f83e156508889
author Bill Yi <byi@google.com> 1470781671 +0000
committer android-build-merger <android-build-merger@google.com> 1470781671 +0000

Import translations. DO NOT MERGE am: 76ba37f81e  -s ours am: 8189f1ff66  -s ours am: df93c5b7c6  -s ours am: 461e8ec49c  -s ours am: cb222f5406  -s ours
am: 15eb6049a6  -s ours

Change-Id: I6315d7c1bc92b3ac43d2bb28d7618df10bc40f9f