am 6be4fe37: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit '6be4fe371a6c24916789c66bf39d73cada779079':
This commit is contained in: