am 62293d8d: am ec0feefd: Merge "Check the ACTIVATE_ON_DOCK setting in DockObserver." into jb-mr1-dev
am 62293d8d: am ec0feefd: Merge "Check the ACTIVATE_ON_DOCK setting in DockObserver." into jb-mr1-dev

* commit '62293d8dd6c28688f308f46dc2128f1780213fe0':
  Check the ACTIVATE_ON_DOCK setting in DockObserver.

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