tree 673b6d3202d87edf16d5866bf98b72f2b1daa3b7
parent a895be2d1009ce9490350d7d4363a4386e023ea2
parent 95b102954cd07242d3e4142d292d4f6086e09af8
author Android Build Merger (Role) <android-build-merger@google.com> 1501118520 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501118520 +0000

Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903  -s ours am: 18b818e2dd  -s ours am: 415ca774d7  -s ours" into oc-dr1-dev-plus-aosp am: 6d7c3b21e5  -s ours" into oc-mr1-dev-plus-aosp