tree 66d8dc47ef0609590429b4149d6e7b7831936887
parent 146f901c9b22adfed1c265cb4738746f92e01c5c
parent 53df9f871a54fd182962719a91b123760b51f45c
author Bill Yi <byi@google.com> 1491638739 +0000
committer android-build-merger <android-build-merger@google.com> 1491638739 +0000

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 53df9f871a  -s ours

Change-Id: Idc17fe6f41f47f75ce48a5fc57072c8fc6b26bf6