am 1d6ca80e: resolved conflicts for merge of 1c92912b to lmp-mr1-dev-plus-aosp
am 1d6ca80e: resolved conflicts for merge of 1c92912b to lmp-mr1-dev-plus-aosp

* commit '1d6ca80ed6a27e324e52b8b944ef64dc07a92e34':
  AudioService: Fix monitorRotation for landscape applications

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