tree 8f7affd2d556eb37ddc412bce25efed680542a3e
parent 206dbc8836b45f3073ddc2c3e9a0fff2a3de8389
parent 7df8046f1bacaf6585ed06da48b1e98a4deaf272
author Bill Yi <byi@google.com> 1474144692 +0000
committer android-build-merger <android-build-merger@google.com> 1474144692 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: e6e616d3cd  -s ours
am: 7df8046f1b  -s ours

Change-Id: I77c1b070a76d3c1ff537dd410bd72631cca297f6