OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBaligh Uddin <baligh@google.com>
Thu, 5 Nov 2015 20:04:58 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Nov 2015 20:04:58 +0000 (20:04 +0000)
commit967f81f5d71312e0978ac72420a589a26f86e1ec
treeb2666280aa1029e5a594fbef024520b211ff45f1
parent335a6c58afed1ba18e2b2676ef98236d02f19648
parent5495ee8a9bc44bb396a7bd2886d02ba7fe8ac711
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 5495ee8a9b  -s ours

* commit '5495ee8a9bc44bb396a7bd2886d02ba7fe8ac711':
  Import translations. DO NOT MERGE