OSDN Git Service

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

Change-Id: Ie3500be37250170ac803e80de5cfaf2976967e22


Trivial merge