tree 412c5e4a8455a640f3e18931f9dfd43f6018a6b3
parent e13d60764cc90406c75bf1641c9d5a7cc3e265ea
parent f12a157531b8eca91fdc40b4ccd03737346d2037
author Selim Cinek <cinek@google.com> 1493664695 +0000
committer android-build-merger <android-build-merger@google.com> 1493664695 +0000

Merge "Fixed that snooze options were animating" into oc-dev
am: f12a157531

Change-Id: Iaf33f16e0dabb0ca56b890a404500a01d26e579d