tree 9964a6c557ae3ae30afd52ca69be0d1757722a4e
parent c63438dce2904355f08ad2b57a8386d474b309be
parent 1e512760b1db986c428c7305476c50065c1d1eb0
author Yigit Boyar <yboyar@google.com> 1437501638 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1437501638 +0000

Merge "Don't reset modes when nested scrolling stops" into lmp-mr1-ub-dev