tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent c9bf387c1f5bf65d1d624451feea7c9889181487
parent f8eb28cd64411c813e294c8c595d5fb0f24bf734
author Adam Cohen <adamcohen@google.com> 1392410141 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410141 +0000

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

* commit 'f8eb28cd64411c813e294c8c595d5fb0f24bf734':