| commit | 0df87c0653fc9e8425643a10cd71594a962fab8d | [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 | c0bb5aae7b26487d5db99e00a070dadf072c2488 | |
| parent | 1fc46c623f9af8aaccfd519ece78331d9a95e579 [diff] | |
| parent | 8e4edb2862e9ae6c9a3e4936b70bb085a141cafc [diff] |
Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug 2595831)" into froyo