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