| commit | 1c63d5fb71ef2ccfd52ca49ebf1924d9fef883f8 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Fri Apr 16 16:21:58 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 16 16:21:58 2010 -0700 |
| tree | c5a922a844ec13a0a5c16c639ae0c309be17e8cd | |
| parent | e599c7e02a62cc167b426877200c0c37d43b37fd [diff] | |
| parent | 65db994ad304ea34d3baf7552e9918f1de00b949 [diff] |
am 71786ceb: am 0df87c06: Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo Merge commit '71786ceb8ce91d209b974f899e7f9c66f57afacd' into kraken * commit '71786ceb8ce91d209b974f899e7f9c66f57afacd': cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54