OSDN Git Service

am bbc090f0: (-s ours) am 78004ec6: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 14 May 2015 06:39:46 +0000 (06:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 May 2015 06:39:46 +0000 (06:39 +0000)
* commit 'bbc090f02296b9faa8813c75886485f48d84d0eb':
  Import translations. DO NOT MERGE


Trivial merge