tree 284eaaf863e0821e2c4a49a36bec3b1b6c84c488
parent bbaa7c6dbae5f353de2d8db0c8f1c7b2771660f0
parent 80d1ab73f7cb394c9532809601353beffb7914b2
author Wink Saville <wink@google.com> 1328915840 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328915840 -0800

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