am 92333f39: am f3bc00a3: am 9e9b5c70: Merge "Fix incorrect Activity#startLockTask doc" into lmp-dev
am 92333f39: am f3bc00a3: am 9e9b5c70: Merge "Fix incorrect Activity#startLockTask doc" into lmp-dev

* commit '92333f395d1a00865b95f7d8c066ebcae8fcfb98':
  Fix incorrect Activity#startLockTask doc

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