OSDN Git Service

am cdf517a6: (-s ours) am ba474807: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 27 Apr 2015 17:46:47 +0000 (17:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Apr 2015 17:46:47 +0000 (17:46 +0000)
* commit 'cdf517a6b56175e634b7ea49a5fcf73d1c48b8b6':
  Import translations. DO NOT MERGE


Trivial merge