| commit | 473d5313c91dfb3dd9752136b0b97d46aaedfd34 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jan 21 16:14:58 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 21 16:14:58 2011 -0800 |
| tree | 38ad144bfb89c269e1b4a9a32b4b2726acf0a997 | |
| parent | 1d07e974537615c9235c51b3efb2d04dc45ba2ed [diff] | |
| parent | dff02333a8ebd71789384cba6f4723a6dd331f37 [diff] |
am dff02333: (-s ours) am 3f8d6fbb: (-s ours) am 5a44d55c: Merge from gingerbread - do not merge * commit 'dff02333a8ebd71789384cba6f4723a6dd331f37':