tree 8bdc9e5eedefcfb44ee6e87c13faf300a3512016
parent c2b38be10fcd37b1cbc4d5bdd612721c4164f8f3
parent b094ba47a721881b7383f216003b81a48c45c207
author Bill Yi <byi@google.com> 1470421741 +0000
committer android-build-merger <android-build-merger@google.com> 1470421741 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: b094ba47a7  -s ours

Change-Id: Ic152eac3a92179537cb18ce715c500a96d376923