OSDN Git Service

am 05bbbfc5: (-s ours) am 0e58fb83: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 23:37:32 +0000 (23:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 23:37:32 +0000 (23:37 +0000)
commit3cabdc8dffb75ceaf6d4a524ef15e7b273cc6d83
tree8548f60e389200f619a0473f6b1938c34619aed4
parent35a0e8808a3800bb4bcc1fc70c103cf15f3524e1
parent05bbbfc5cb24d06e5ad56b70b8b1551d8cafac03
am 05bbbfc5: (-s ours) am 0e58fb83: (-s ours) Import translations. DO NOT MERGE

* commit '05bbbfc5cb24d06e5ad56b70b8b1551d8cafac03':
  Import translations. DO NOT MERGE