tree e867f5f445448fa3e60ca73c0437d1998cfe7e9f
parent b067df28d0f3994b95f07d6185fbceba43f23e39
parent 1bc265bfa9f0f572045c9d3b3f54a36f9388b4ca
author Bill Yi <byi@google.com> 1479944259 +0000
committer android-build-merger <android-build-merger@google.com> 1479944259 +0000

Import translations. DO NOT MERGE am: 8b455d0db5  -s ours
am: 1bc265bfa9  -s ours

Change-Id: Id4e547c5263ec1f3341e370922d9a54c984e0bfa