OSDN Git Service

am c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 17 Mar 2014 20:43:48 +0000 (20:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Mar 2014 20:43:48 +0000 (20:43 +0000)
commitf6eceb2c79ff403ec1608ff36c09d5b8c9ea8bd2
tree7b5af6406eab2199416834641948d7ea6c1abf2a
parent6e7db71959c43bfaa0b834f583e59377705a1d43
parentc8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48
am c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE

* commit 'c8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48':
  Import translations. DO NOT MERGE