| commit | f21c643da4881ee8db4943ce7dd14761e7c5d130 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Jun 08 17:31:40 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 08 17:31:40 2011 -0700 |
| tree | bf7ba9a62e22d926883da1a385d662fde37d14d6 | |
| parent | 498363f875a11e9b028c8654b92a16d9b1ecc9cc [diff] | |
| parent | 575b04b0805398f1caf8edb536764eb75bc2a840 [diff] |
am 575b04b0: am fb73583e: am fe3315b5: Merge from gingerbread * commit '575b04b0805398f1caf8edb536764eb75bc2a840':