am 1ff04118: Merge change 23693 into eclair
am 1ff04118: Merge change 23693 into eclair

Merge commit '1ff041180c66ef6f1020cf5314a665d319e9ac86' into eclair-plus-aosp

* commit '1ff041180c66ef6f1020cf5314a665d319e9ac86':
  dumpstate: Add option to output to socket, disable code that switched to nonroot

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