tree 10da860fcff71886af91d082e31f0e1917926848
parent 40b26ff1c6c7aa8864ed12e23a8cbcfaab9c8519
parent f5548455bb7d6ea4ea51bdafb6698764782766e0
author Adam Cohen <adamcohen@google.com> 1414566120 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566120 +0000

am f5548455: am a1e8ff8c: am bb2c462e: am f8eb28cd: am 6957a8d7: am 044db335: Merge "Making sure overview mode can\'t get stuck (issue 11022017)" into jb-ub-now-indigo-rose

* commit 'f5548455bb7d6ea4ea51bdafb6698764782766e0':