tree cba62d0d64153aa2169651696bc238591341d679
parent 1122ebd51605ad21cda47b0478b64eca8866d036
parent a1e8ff8c039a26756b5646b576de14da94f1d152
author Adam Cohen <adamcohen@google.com> 1414085233 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085233 +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':