am 76a63b2a: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/device/moto/wingray into ics-scoop-plus-aosp

* commit '76a63b2a7fc05f86c24c009cc0f929311e13acd3':