tree 6c39e29360f2999b0da423a64dd9b81c0ad61c7d
parent 5c5c60e94708a3db3d97e60a386fafa5900233f6
parent fee3d0532ec4c5b938b5c55094126963d75b6c39
author Bill Yi <byi@google.com> 1465142963 +0000
committer android-build-merger <android-build-merger@google.com> 1465142963 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e01fca71d4  -s ours
am: fee3d0532e  -s ours

* commit 'fee3d0532ec4c5b938b5c55094126963d75b6c39':
  Import translations. DO NOT MERGE

Change-Id: Ie51d060b4d3abb12ec9b7aa049d8b91ebf6384e0