OSDN Git Service

am 9d9aac4c: resolved conflicts for merge of 2bf3800b to stage-aosp-master
authorCraig Mautner <cmautner@google.com>
Wed, 29 Oct 2014 17:11:12 +0000 (17:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 17:11:12 +0000 (17:11 +0000)
commit177f91d1ede0cef9fc6c7c29f163b78467c49f8c
treea04f2457495c2834b8256fdb21f7af8490662709
parent91934b63eeaa29d39ca0b008a111536973f0a1d1
parent9d9aac4cacce75b4847aebce0f019250dc3b4e93
am 9d9aac4c: resolved conflicts for merge of 2bf3800b to stage-aosp-master

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