OSDN Git Service

am 7c137e3c: (-s ours) am 6b4bbd9b: Import revised translations DO NOT MERGE
authorKenny Root <kroot@google.com>
Mon, 18 Oct 2010 17:32:56 +0000 (10:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 Oct 2010 17:32:56 +0000 (10:32 -0700)
commitec031f50810fd16cb6243fbbbabd9ac76820c72b
tree085857558285a6f052ecf8a2120942076913ccff
parent3795d62b95213fa0ead4de6b974d310038823160
parent7c137e3ceec2757907422b0aa3b3da90c37df702
am 7c137e3c: (-s ours) am 6b4bbd9b: Import revised translations DO NOT MERGE

Merge commit '7c137e3ceec2757907422b0aa3b3da90c37df702'

* commit '7c137e3ceec2757907422b0aa3b3da90c37df702':
  Import revised translations DO NOT MERGE