tree 3bfe3832e7c72b5cdcac42ba3348351771e1da44
parent 8bd92a279f1f8e87cc796d0a7b738a7c2776f8ad
parent 1d04e1d6a8e3194df4c67e1206202481c8d2ade7
author Android Build Merger (Role) <android-build-merger@google.com> 1505766473 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1505766473 +0000

Merge "Import translations. DO NOT MERGE am: 791ebeed32  -s ours am: fee3748d04  -s ours am: 456c147827  -s ours am: c49cdb6749  -s ours am: cda0464f7d  -s ours" into oc-mr1-dev-plus-aosp