OSDN Git Service

am d1c5ae48: (-s ours) am b4ee938f: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 4 Mar 2015 13:44:17 +0000 (13:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Mar 2015 13:44:17 +0000 (13:44 +0000)
* commit 'd1c5ae486dc09d10dffaf138c98ad6daed182993':
  Import translations. DO NOT MERGE


Trivial merge