OSDN Git Service

am 8cd002e2: (-s ours) am e314ac4f: Import revised translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Fri, 22 Oct 2010 00:44:18 +0000 (17:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Oct 2010 00:44:18 +0000 (17:44 -0700)
commit3b838ff548c129c8ea087a73f21e77a503d58f97
treefde25ef2847f5712fc25296a81a04b4bf653ac14
parent883f55b1d261862b0de1b43af0b17d351761a9c6
parent8cd002e279431727f38e77870a3d0a67e96db023
am 8cd002e2: (-s ours) am e314ac4f: Import revised translations.  DO NOT MERGE

Merge commit '8cd002e279431727f38e77870a3d0a67e96db023'

* commit '8cd002e279431727f38e77870a3d0a67e96db023':
  Import revised translations.  DO NOT MERGE