OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 17 Jun 2016 04:28:28 +0000 (04:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 04:28:28 +0000 (04:28 +0000)
commit560ad742400a74accec0b5a9cb9182ac59c3550d
tree5c5093a140b0b6f2511619e174eaf6395214b6db
parent6abeadf69d7e2d8b7010dc2eb6de363462a7a119
parent11b2b269116d4d182a1f0166762a95e4626a06e4
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 11b2b26911  -s ours

Change-Id: If8ae0b33ababcad202f1413032772182acb73de3