| commit | 5076ba0aa1ad34211f82df28a04a745155c2fa51 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Jan 16 10:44:01 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jan 16 10:44:01 2011 -0800 |
| tree | 7ae5a908841a12a634cdd542ea8f5152acd7aa84 | |
| parent | ec647e2efa1ef4ac297ce2a262d33d99f0db8578 [diff] | |
| parent | 89a11e5d5c3210359679e6f211444e0d7240ae0a [diff] |
am 89a11e5d: (-s ours) am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge * commit '89a11e5d5c3210359679e6f211444e0d7240ae0a': Squash commits of the following patches, cherry-picked from other branch - do not merge.