| commit | e2c576fe2dc71cc40d4bffa4973a39c0bfb4e750 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Sep 28 07:20:50 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 28 07:20:50 2010 -0700 |
| tree | ddc5aca3aaa9a9e29784ad2de455e87b49c8aa29 | |
| parent | c74cd3092397bbdc943ddc61cf2f67b6b4aee1e5 [diff] | |
| parent | 9a4ac9ab2de6b28b0dcf4f49127dc4075c4148c6 [diff] |
am 9a4ac9ab: (-s ours) Reconcile open-source froyo and Google-internal froyo - DO NOT MERGE Merge commit '9a4ac9ab2de6b28b0dcf4f49127dc4075c4148c6' into gingerbread * commit '9a4ac9ab2de6b28b0dcf4f49127dc4075c4148c6':