OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBaligh Uddin <baligh@google.com>
Thu, 5 Nov 2015 20:07:40 +0000 (20:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Nov 2015 20:07:40 +0000 (20:07 +0000)
commit42facf05ce7a7b21667335bba2f942ca2eda873d
treeb2666280aa1029e5a594fbef024520b211ff45f1
parent82ab657901ef66fba38c67d7c6589d22cc82e3dd
parent69cc50f1e881b80db9767ce7535fe58067ca4222
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 69cc50f1e8  -s ours

* commit '69cc50f1e881b80db9767ce7535fe58067ca4222':
  Import translations. DO NOT MERGE