tree d110ba975877c061a42c162f903e10a79645c173
parent 521db337f3aa4e72e047b00aa5bee086be2b0434
parent 1689594851a6dd985cff69913e7f4bc548062808
author Chris Wren <cwren@android.com> 1435168461 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1435168463 +0000

Merge "don't clear notification effects in response to peeks" into mnc-dev