tree 166fb9479942a3a4adaaed977afa8518ba02b48a
parent 13e10d8b9df6d4f1ac132bd1215a777e8b3c94af
parent cbedf9e4375ce7e2bc56ba14723a2cbbaa7ec0d7
author Bill Yi <byi@google.com> 1475136062 +0000
committer android-build-merger <android-build-merger@google.com> 1475136062 +0000

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

Change-Id: I6c311e67bd1a41767ab11847aa950c8819e3857d