tree 8481e67866b235f6dbb8231e264143043f973af9
parent e37a1658dd5309f7e116f4050887f69ee408fa96
parent 82b992382734473605a3790c90ebb25e65901c7e
author The Android Open Source Project <initial-contribution@android.com> 1502299002 +0000
committer android-build-merger <android-build-merger@google.com> 1502299002 +0000

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 8bcd7a1a5a  -s ours
am: 82b9923827  -s ours

Change-Id: I6171f2210408fc7f8016fa5f23612a14ceeb95ba