resolved conflicts for merge of 4330b146 to honeycomb-merge
resolved conflicts for merge of 4330b146 to honeycomb-merge

Change-Id: I625dcf6d248ea7f6515094eae689f6550b0d6d1a

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