tree cba62d0d64153aa2169651696bc238591341d679
parent a946094bbfad6d3fdd0e1dfaa8fecd4f677a328b
parent f8d8c22e4d1254776f447a52ade03f05e57b0ec8
author Winson Chung <winsonc@google.com> 1414085474 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085474 +0000

am f8d8c22e: am c665bd13: am a73c1fac: am e248b837: Merge "Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug 11439120)" into jb-ub-now-jolly-elf

* commit 'f8d8c22e4d1254776f447a52ade03f05e57b0ec8':