tree 44a81ce2a5890ef7ca6c49c1a030ac546a9ed224
parent da8b56d2b082690a6c84cb280bf27d3ccc17408d
parent 7640ef24d1dac291dbf756ed831052af87b3757a
author Bill Yi <byi@google.com> 1474547701 +0000
committer android-build-merger <android-build-merger@google.com> 1474547701 +0000

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

Change-Id: I6d733530f0fb6ab39ae4819e40cd5d5fbd47ff8e