tree d70880368428532c91034d94a6bb344686b83e85
parent c07d76a77bb2267c00af95725c7b501635a1b18b
parent 3a3cf6e363b6f7bd1393cad787ecad3c968c26cd
author Android Build Merger (Role) <android-build-merger@google.com> 1502904758 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502904758 +0000

Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 175e8784dd  -s ours" into oc-mr1-dev-plus-aosp