| commit | e742d42d5435a633241715428b3715ff4a30f0f8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 24 11:55:38 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 24 11:55:38 2010 -0700 |
| tree | 92a5eb9d2abbb155c59610d0ea8c6dd0225be62e | |
| parent | ebd93b52e666df18f942362c9af9634dbcad8840 [diff] | |
| parent | 41357ba8d6f2eae906a2af19a7296f47dbc6d286 [diff] |
am 41357ba8: am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Merge commit '41357ba8d6f2eae906a2af19a7296f47dbc6d286' * commit '41357ba8d6f2eae906a2af19a7296f47dbc6d286': Import revised translations