am 2b1cfef1: Merge change 25937 into eclair
am 2b1cfef1: Merge change 25937 into eclair

Merge commit '2b1cfef19efb11d283a08042d37a326141c28429' into eclair-plus-aosp

* commit '2b1cfef19efb11d283a08042d37a326141c28429':
  Change the broadcast intent for dock state changes from a sticky broadcast to

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