OSDN Git Service

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

Change-Id: If851a2131087c8a2199dc51f0ba4a8bce75fcc92


Trivial merge