commit d8ab73d71c50f8695ee8b671fdb838f2fd18790d
author Winson Chung <winsonc@google.com> Wed Oct 01 20:07:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 01 20:07:38 2014 +0000
tree dba6535c55831cf20e9b29c8ed4eff0710f96024
parent 0a5f518e0ebb251f441e4f54b48e580a04006665
parent d092fc7076310fca5edd089df5bb5398096f6627

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 the debug mode o

* commit 'd092fc7076310fca5edd089df5bb5398096f6627':
  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