| commit | 891b4e9d50369f91e714e00b71616b85340ccbfe | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Apr 21 11:42:29 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 21 11:42:29 2010 -0700 |
| tree | 61d04fbd24f6e7b350838057bdfaad3169577117 | |
| parent | d428e48aa1295519c49ace23905c2acf5a625ccc [diff] | |
| parent | beca3af74d2a5baeba00ada49ba2480d36535f5e [diff] |
am beca3af7: cherry-pick from master: 3c26ae869e24e6cd7c63dc44fc3f46221262e15f Merge commit 'beca3af74d2a5baeba00ada49ba2480d36535f5e' into froyo-plus-aosp * commit 'beca3af74d2a5baeba00ada49ba2480d36535f5e': cherry-pick from master: 3c26ae869e24e6cd7c63dc44fc3f46221262e15f