OSDN Git Service

am 94127464: (-s ours) am 99ec3595: (-s ours) am ef2f6596: (-s ours) am ac3b53a7...
authorGeoff Mendal <mendal@google.com>
Mon, 12 Oct 2015 17:13:36 +0000 (17:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Oct 2015 17:13:36 +0000 (17:13 +0000)
* commit '94127464b460b65ca6689e1c5156789decca8488':
  Import translations. DO NOT MERGE


Trivial merge