Finished patching 'include/ui'
Merge branch 'aosp-ics' of ssh://github.com/MoltenMotherBoard/android_framework_base into aosp-ics