am 177f91d1: am 9d9aac4c: resolved conflicts for merge of 2bf3800b to stage-aosp-master

* commit '177f91d1ede0cef9fc6c7c29f163b78467c49f8c':
  Doesn't re-sort app windows when move task to top
This commit is contained in:
Craig Mautner
2014-10-29 17:37:25 +00:00
committed by Android Git Automerger

Diff Content Not Available