OSDN Git Service

am 868326a8: (-s ours) am 6397b5e2: (-s ours) am c9282823: (-s ours) am e4d510fa...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Oct 2014 17:23:00 +0000 (17:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Oct 2014 17:23:00 +0000 (17:23 +0000)
* commit '868326a8bb542f371106ba8256d0c6631028a037':
  Import translations. DO NOT MERGE


Trivial merge