tree d189044d2ab6a2ebca31b32fbb93accf3a71cd5f
parent fcf1647e8581294553ef2b5b2769119043f1a2e3
parent 79e5f61474d106a4d598ee734f9f4b91ec772bbe
author Bill Yi <byi@google.com> 1507473022 +0000
committer android-build-merger <android-build-merger@google.com> 1507473022 +0000

Import translations. DO NOT MERGE am: 80d87da085  -s ours am: d250d3aa34  -s ours am: 09e6f1457b  -s ours am: 581e056425  -s ours
am: 79e5f61474  -s ours

Change-Id: I0350ae33b9b85fbb9f6e5fdb779daab9bf92c478