| commit | 65bca31122622b4ab5109e1e2226d862345445ff | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Jun 09 16:24:15 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 09 16:24:15 2010 -0700 |
| tree | 5182ee9ce88cf3192bc2a50a8f9e5734efcc45da | |
| parent | d92abd08fc38b7129288ae76a5bfdd705c8302c9 [diff] | |
| parent | e70f4e74c8e333251c4b51fadffd21dd9c7dd5f0 [diff] |
am e70f4e74: merge from froyo-plus-aosp