commit | 41357ba8d6f2eae906a2af19a7296f47dbc6d286 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 23:36:55 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 23 23:36:55 2010 -0700 |
tree | 57c2cd1b8666316f1628f053f6697eae3bf532da | |
parent | dbdbd15296d2d834fcbd01c2875b1e50c80499c4 [diff] | |
parent | 02e731fb6452df796d976cb9e407b210cfffcda5 [diff] |
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