tree 1678aa1dde998d320e62cdfd2b1783f111b5379b
parent 52328f81bb9ebcff080173568f920539a9bf1e12
parent 3e0f0fa9b4a456c254b794affc00f3ec60d6a5a4
author Android Build Merger (Role) <android-build-merger@google.com> 1462326640 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1462326640 +0000

Merge "Import translations. DO NOT MERGE am: 2317faf4d9  -s ours am: 2787b2d5df  -s ours" into nyc-mr1-dev-plus-aosp