OSDN Git Service

am 6397b5e2: (-s ours) am c9282823: (-s ours) am e4d510fa: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Mon, 13 Oct 2014 22:41:08 +0000 (22:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Oct 2014 22:41:08 +0000 (22:41 +0000)
* commit '6397b5e2f809596b2a77674dd7a701ede24dc3bb':
  Import translations. DO NOT MERGE


Trivial merge