tree 59691f5d180b43b09e849627654c32ec2ad5bfc7
parent f69fe23bff0984ade6a44a3534dbc8e889d29531
parent 4ed8a336efc76847fbf3e11a0ae66aa74c422846
author Craig Mautner <cmautner@google.com> 1418939856 +0000
committer android-build-merger <android-build-merger@google.com> 1418939856 +0000

am 2eb575b4: am 2281e7d6: Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev
automerge: 4ed8a33

* commit '4ed8a336efc76847fbf3e11a0ae66aa74c422846':
  Make window mgr stack movement track activity mgr