tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent d7c9cc50633065f2421f057d1ebad2bccb211510
parent a1e8ff8c039a26756b5646b576de14da94f1d152
author Adam Cohen <adamcohen@google.com> 1392411528 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411528 +0000

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 'a1e8ff8c039a26756b5646b576de14da94f1d152':