commit | 9e12bb97272cf7812912042c316856b82789eb97 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Fri Feb 10 10:15:46 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:15:46 2012 -0800 |
tree | 696d35b58eea07325f0a839d95eafdf79f9c0583 | |
parent | 0197acb26af0439349bff61d8deea7557fe837cd [diff] | |
parent | 99bc4b92a42a9db428d4f0519dfbab4d4a519ed9 [diff] |
am 99bc4b92: am a2319e19: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/Launcher2 into ics-scoop-plus-aosp * commit '99bc4b92a42a9db428d4f0519dfbab4d4a519ed9':