tree f18b4f23760535840cf3c0410eb17d186883dd01
parent 71caaa9f9d65e707a74188b0a6db8f05a75112c6
parent a0f6be636342bc586abf3806416debe69e5e9303
author Android Build Merger (Role) <android-build-merger@google.com> 1464019620 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464019621 +0000

Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7d1246e95d  -s ours am: 712c2cb2d2  -s ours" into nyc-mr1-dev-plus-aosp