OSDN Git Service

am c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 25 Nov 2013 20:58:30 +0000 (12:58 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 25 Nov 2013 20:58:30 +0000 (12:58 -0800)
commit5f87bb027ce5799ce88da15f88ca4b4f36f88007
tree6deeb52821e730cfc029e23963c17298801018cf
parent6a1d96e710f155b148c60cecce5c6beae1d02db1
parentc2d1fdac9e7e914d4ecded6016c9056fa250d267
am c2d1fdac: (-s ours) am d82e8f2b: (-s ours) Import translations. DO NOT MERGE

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