tree 32c6eb7e51b07678c1266fd5899e44931e070e0a
parent 1efc63d9d4c403e4bdbcd8dcccffa308c44399c7
parent 69a23a37f5d274560182ea4af0bd0d23a7b74609
author Android Build Merger (Role) <android-build-merger@google.com> 1499743175 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499743175 +0000

Merge "Import translations. DO NOT MERGE am: 28b67f8eea  -s ours am: 9839965b25  -s ours am: 7e05669aba  -s ours" into oc-dr1-dev-plus-aosp