tree bc949f07e052f3545cd6db47c55f5c775a741f06
parent e972a23fafa385ebba4fec0ce9e689a1263b64e9
parent 3afce04bf8733e810b39e698a06c87bd9ecfd3cc
author TreeHugger Robot <treehugger-gerrit@google.com> 1472711779 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1472711779 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev