OSDN Git Service

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

Change-Id: Ib833f99b578d48c53ce481fc098e694cf8acc76d


Trivial merge