OSDN Git Service

am 8116ff65: (-s ours) am a0b87a24: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 6 Aug 2014 19:55:43 +0000 (19:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 6 Aug 2014 19:55:43 +0000 (19:55 +0000)
* commit '8116ff6506bf884d1c0c4bac6d4b4d59c35eb9e8':
  Import translations. DO NOT MERGE


Trivial merge