| commit | f3401a3e85ba408f5f967daa394bdd739513fc0f | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Fri Apr 16 16:14:33 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 16 16:14:33 2010 -0700 |
| tree | 6071c87bf800c60d8c2f8dbd85a2f0c2b6e669f7 | |
| parent | 61e1476f59c808254c78c0cdcd7b3f611cc9004e [diff] | |
| parent | 218aa6b8186bce2d98aef917adbc109d49ac2a87 [diff] |
Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo