OSDN Git Service

am 8788bd83: (-s ours) am 93c6f4fc: (-s ours) am 20625ebc: (-s ours) am 49848a63...
authorGeoff Mendal <mendal@google.com>
Mon, 12 Oct 2015 17:13:48 +0000 (17:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 17:13:48 +0000 (17:13 +0000)
* commit '8788bd837b608933ad909274ed4ed5adadaf4009':
  Import translations. DO NOT MERGE


Trivial merge