OSDN Git Service

am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is...
authorJean-Baptiste Queru <jbq@google.com>
Tue, 24 Aug 2010 06:36:55 +0000 (23:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Aug 2010 06:36:55 +0000 (23:36 -0700)
commit41357ba8d6f2eae906a2af19a7296f47dbc6d286
tree57c2cd1b8666316f1628f053f6697eae3bf532da
parentdbdbd15296d2d834fcbd01c2875b1e50c80499c4
parent02e731fb6452df796d976cb9e407b210cfffcda5
am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Merge commit '02e731fb6452df796d976cb9e407b210cfffcda5' into gingerbread-plus-aosp

* commit '02e731fb6452df796d976cb9e407b210cfffcda5':
  Import revised translations