resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp
resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp

Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base