tree 808c80b05792ca55ee081cf6b84cb853441d0ead
parent 2631bc2b9a394784120c27926d84714197cafd46
parent f870ef3edccc4a02417c9a7104a8cb20682ad872
author Bill Yi <byi@google.com> 1480987221 +0000
committer android-build-merger <android-build-merger@google.com> 1480987221 +0000

Import translations. DO NOT MERGE am: dbb0502d2f  -s ours
am: f870ef3edc  -s ours

Change-Id: Ifda9eca142b398cdb4dc77b92a6f8f1046dd322b