tree 7cc123a83e1cbffbd5c208bfbe7d27959f2cec1b
parent 0d7f9f30935a0337d878d0ba01e95589a94ca996
parent 8292603549ebeabaa0df4a515ff47fbf92b62d26
author Android Build Merger (Role) <android-build-merger@google.com> 1462326655 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1462326655 +0000

Merge "Import translations. DO NOT MERGE am: a86144fd30  -s ours am: 00499a50bd  -s ours" into nyc-mr1-dev-plus-aosp