tree f6302bab90500b72972eb912b3bd1f302bbca43c
parent 1d2bf4f6313686eb372a10d2707e20e461ae34be
parent fc60583a2c494414840fa181438135d1926aba8a
author Bill Yi <byi@google.com> 1459882453 +0000
committer android-build-merger <android-build-merger@google.com> 1459882453 +0000

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

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

Change-Id: Ie62a08f06cb9eaff0a441e3c784b1f1c605dec97