commit 0dad6a0732633a11fa780135c3c1f52defac9f16
author Winson Chung <winsonc@google.com> Wed Oct 01 22:17:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 01 22:17:41 2014 +0000
tree 2a5a64e137eba4dbbc59a4287a9525d0de695059
parent 7569294eb76106de3e4549e1589c1db2ce6ec554
parent d8ab73d71c50f8695ee8b671fdb838f2fd18790d

am d8ab73d7: am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable th

* commit 'd8ab73d71c50f8695ee8b671fdb838f2fd18790d':
  Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option