OSDN Git Service

am 23adae13: (-s ours) am 4fdde2b5: (-s ours) am 2b802ceb: (-s ours) am cd6e6034...
authorBaligh Uddin <baligh@google.com>
Sun, 27 Sep 2015 03:15:32 +0000 (03:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 27 Sep 2015 03:15:32 +0000 (03:15 +0000)
* commit '23adae13328e88ac38b0448a4375dcb3264839e5':
  Import translations. DO NOT MERGE


Trivial merge