OSDN Git Service

am 331c3ec7: (-s ours) am 7bd7a242: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Sat, 19 Sep 2015 03:08:01 +0000 (03:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 19 Sep 2015 03:08:01 +0000 (03:08 +0000)
commit5c3ea10c7ba46e33284ceb4d363e4a304dabc131
treee4b097e9d0a3e8adb2c93d006c582d8e1c7a7722
parent957457a8fac025b7a75669d48291be1a0f9c4450
parent331c3ec7835044aa9bc6da22bae71695920aae62
am 331c3ec7: (-s ours) am 7bd7a242: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '331c3ec7835044aa9bc6da22bae71695920aae62':
  Import translations. DO NOT MERGE