OSDN Git Service

am 3488549f: (-s ours) am b2c607db: (-s ours) am ba9836d9: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Thu, 30 Oct 2014 23:59:34 +0000 (23:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Oct 2014 23:59:34 +0000 (23:59 +0000)
* commit '3488549f75ef5354aa562c03b179b07cbdf3fa6b':
  Import translations. DO NOT MERGE


Trivial merge