tree 5e46eb197f768d83838afb7541ca9d1a01dda85f
parent 5c2575071e95e8efbb73f1a78f8dc382eda6e453
parent f79616b4277f477985f96f8a486126a389905c7d
author Bill Yi <byi@google.com> 1464973953 +0000
committer android-build-merger <android-build-merger@google.com> 1464973953 +0000

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

* commit 'f79616b4277f477985f96f8a486126a389905c7d':
  Import translations. DO NOT MERGE

Change-Id: Ia6869ed50d88aea53c3c42e02337eaecf1dd870f