OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 17 Jun 2016 04:28:26 +0000 (04:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 04:28:26 +0000 (04:28 +0000)
commit6abeadf69d7e2d8b7010dc2eb6de363462a7a119
tree5c5093a140b0b6f2511619e174eaf6395214b6db
parent0e2f17da9f5596d1c7cf895679ab366001c77dd6
parent0555bb3003c5dbbe4123bdf35a32f621243d1b20
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 0555bb3003  -s ours

Change-Id: I07fc3a494ca2ab9e5585febd187c08073483c297