OSDN Git Service

am a359fb77: (-s ours) am 6d409870: Import revised translations
authorKenny Root <kroot@google.com>
Thu, 29 Apr 2010 23:45:47 +0000 (16:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Apr 2010 23:45:47 +0000 (16:45 -0700)
commitb458ec285f60fd36de42c3a3079188f2ef692b9f
treeb1c165138c7cea2f0e0debd65d56c261161b2174
parentcb29eb04f5c3d1b601a46080cec477b275ee4d6f
parenta359fb77d41ab3ac00a1020b42fa2e898904c1af
am a359fb77: (-s ours) am 6d409870: Import revised translations

Merge commit 'a359fb77d41ab3ac00a1020b42fa2e898904c1af' into kraken

* commit 'a359fb77d41ab3ac00a1020b42fa2e898904c1af':
  Import revised translations