tree 6c62422d64f4627a1fcbecb102bb083ca4b3ad57
parent 597204719043da941b9e31e069fedb91b0729225
parent 44c39e709b2ecb937338cf0630fc8d29795a54d2
author Bill Yi <byi@google.com> 1466617202 +0000
committer android-build-merger <android-build-merger@google.com> 1466617202 +0000

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

Change-Id: Iabedf9ff2c7c4d712b41c71b24e312ff697be737