tree d57b5c9453564b8d067218c6e3b97b35276e7279
parent 584156ad29ec3b62a403ac692b16025c652b984c
parent 3cab656d3846b453ba406dd6da401616a0ce95e5
author Scott Main <smain@google.com> 1328562444 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328562444 -0800

Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp