OSDN Git Service

am 336beed4: (-s ours) am aee4a86a: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 25 Feb 2015 17:26:53 +0000 (17:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Feb 2015 17:26:53 +0000 (17:26 +0000)
* commit '336beed4d1006211139ab0b8e34227b364f17899':
  Import translations. DO NOT MERGE


Trivial merge