OSDN Git Service

am c8a4babe: (-s ours) am 5211dfd5: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 23 Feb 2015 14:02:43 +0000 (14:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 23 Feb 2015 14:02:43 +0000 (14:02 +0000)
* commit 'c8a4babe93e4fd0cecb6b91a020b9252ac426004':
  Import translations. DO NOT MERGE


Trivial merge