commit | 16affed50e85b0569935fda20b6ec42742436e32 | [log] [tgz] |
---|---|---|
author | Mathias Agopian <mathias@google.com> | Tue Jun 07 11:15:01 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 07 11:15:01 2011 -0700 |
tree | cce16f99380193f11fcdafa0570a3fd7efdb5504 | |
parent | 98c185e69423b5a72fccc6a15d944505fc96fc97 [diff] | |
parent | cf3036ebef2929f84bc4e34ed1e9d96eefd6a5e7 [diff] |
am cf3036eb: (-s ours) am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) * commit 'cf3036ebef2929f84bc4e34ed1e9d96eefd6a5e7': merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)