tree f18b4f23760535840cf3c0410eb17d186883dd01
parent 720c041b1a233e7b5e775056b92144494bd9000c
parent 8c14e3ad910939c0cf36796d86a9729dd132e956
author Android Build Merger (Role) <android-build-merger@google.com> 1464019551 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464019552 +0000

Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541  -s ours am: 1a49e73d2a  -s ours" into nyc-mr1-dev-plus-aosp