| commit | 71786ceb8ce91d209b974f899e7f9c66f57afacd | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Fri Apr 16 16:17:55 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 16 16:17:55 2010 -0700 |
| tree | 976cee79d2752819964430edd96e9508b117f9c7 | |
| parent | a9ea147dc204cd3eed7ed99f8b7d6464c7f740bf [diff] | |
| parent | 0df87c0653fc9e8425643a10cd71594a962fab8d [diff] |
am 0df87c06: Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo Merge commit '0df87c0653fc9e8425643a10cd71594a962fab8d' into froyo-plus-aosp * commit '0df87c0653fc9e8425643a10cd71594a962fab8d': cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54