OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 17 Jun 2016 05:16:42 +0000 (05:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 05:16:42 +0000 (05:16 +0000)
commit2fc6dfb4409c57f2c37b886cf98b2db3740723c0
tree5c5093a140b0b6f2511619e174eaf6395214b6db
parent3b937e62a29459395c983afd4fd4492e34baa77d
parent12af7eb3ab165f534fd4e3542e04d474409247a6
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 12af7eb3ab  -s ours

Change-Id: I25c71a14da3d1fa62d7916f2cc54fb987d87d2f6