tree bdf2ccff92fac03b4f806e26d439dfeb9d3e247c
parent 4f2bb4d6e7ba36c648778b9471d0143cb210dddc
parent c6831def3c5f4b434efd72022cde40e5e8af9436
author Bill Yi <byi@google.com> 1470781453 +0000
committer android-build-merger <android-build-merger@google.com> 1470781453 +0000

Import translations. DO NOT MERGE am: 3941e96a4d  -s ours
am: c6831def3c  -s ours

Change-Id: I4ff4081bde67bde628f4a27350f5354746812c9c