tree 9f882343230d73dc8662847f5c41a34a527baca3
parent a56ea23d9cfd25f9831d36c1294af686d9a11be5
parent 1125f26d5f331733a2b848cda0cd7fd52351bb3a
author Android Build Merger (Role) <android-build-merger@google.com> 1499442940 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499442940 +0000

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 33393ffa7d  -s ours" into oc-dr1-dev-plus-aosp