tree e35ecf0ff78f3205471b07252e2b6f85aea099ef
parent 97d6f9a705711870ee9a06fe4f28050228fcfb13
parent 96ef409ebdc798a82786e5dcecfd7d897be0ed30
author Winson Chung <winsonc@google.com> 1322091522 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1322091522 -0800

Merge "Preventing springloaded mode from snapping back due to timeout. (Bug 5649189)" into ics-mr1