tree 391d2cf4579adc6f4935ac0eec3985458e5bba72
parent 4d413b81859ef65a5a344d2795094ebad5a9c554
parent 76a63b2a7fc05f86c24c009cc0f929311e13acd3
author Wink Saville <wink@google.com> 1328915970 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328915970 -0800

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

* commit '76a63b2a7fc05f86c24c009cc0f929311e13acd3':