OSDN Git Service

Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: c1079364cb -s...
authorBill Yi <byi@google.com>
Thu, 21 Jul 2016 03:48:17 +0000 (03:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 03:48:17 +0000 (03:48 +0000)
am: 0a94845a7e  -s ours

Change-Id: Ie4030627ad6d4961f4479ee48b3efddcd828ae56


Trivial merge