OSDN Git Service

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

Change-Id: Ic2b521dc5a8f71bbdac12777253975fd4fdd3cce


Trivial merge