tree 54948ddcffdd6d2bd01232f73cc0a0c3a81ec8ee
parent ab9a09a4449e959fea9e70a8c2b3690e158d276f
parent f38f0b5b5b3c73c20911e3db4e0c89a8842d9b87
author Bill Yi <byi@google.com> 1479691627 +0000
committer android-build-merger <android-build-merger@google.com> 1479691627 +0000

Import translations. DO NOT MERGE am: 2ec9c307a4  -s ours
am: f38f0b5b5b  -s ours

Change-Id: I37789cb508173be7a579d7c15d9bdf44ec747d25