OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 9353cf10ba -s ours...
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:09:31 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:09:31 +0000 (18:09 +0000)
am: 2482315b37  -s ours

Change-Id: Ib4f15738eaa69ae53e633fcba8ba9229c28871fd


Trivial merge