tree c5f06ad844af6973011edb45c748d7eb0dae9bf0
parent 5b8b2c1ba0f5be209fb3e71488d8ea16f16090c5
parent 1f3a9b5e9c9703c2f620fa029a3904bf13bf43cc
author Bill Yi <byi@google.com> 1508199706 +0000
committer android-build-merger <android-build-merger@google.com> 1508199706 +0000

Import translations. DO NOT MERGE am: a3566ef617  -s ours
am: 1f3a9b5e9c  -s ours

Change-Id: I2ad6e9da1045e83ccdc898173d9b7e855f0202be