tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 46a26d8c518475b41c81a96eaee699dc8d72cd68
parent bb2c462e140aef01e1244ae0a8f18714f135e540
author Adam Cohen <adamcohen@google.com> 1392411022 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411022 +0000

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