OSDN Git Service

am 78462033: (-s ours) am dc3d4642: (-s ours) am 5628cfde: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Fri, 19 Sep 2014 23:14:00 +0000 (23:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 23:14:00 +0000 (23:14 +0000)
* commit '7846203368d89fdd1f976434e7820984f1ab878b':
  Import translations. DO NOT MERGE


Trivial merge