Commits

Android Git Automerger authored af2abf5adaeM
am a66926ff: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp * commit 'a66926ff7fac7ef77da1b5f3f1a1dd9dd8d6b960':
Showing diff to0631ac93f63