am 7a7c6aa0: Merge into jb-mr1-dev
am 7a7c6aa0: Merge into jb-mr1-dev

* commit '7a7c6aa0c35d80145e163d9e637180d3be127441':
  Force activities to run on the second display for testing.

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