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

Browse Source

* commit '9d9aac4cacce75b4847aebce0f019250dc3b4e93':
  Doesn't re-sort app windows when move task to top

...

This commit is contained in:

Craig Mautner

2014-10-29 17:11:12 +00:00

committed by Android Git Automerger

parent 91934b63ee 9d9aac4cac

commit 177f91d1ed

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available