tree 2ede19e9fa5581e095f2f68ed411c99e54ade611
parent b02062241d457e8b53de043e723d24c29db3fa5b
parent 29532b40c7946b9ddecb84b67f8eeeef1f8249ff
author Jason Monk <jmonk@google.com> 1498509595 +0000
committer android-build-merger <android-build-merger@google.com> 1498509595 +0000

Merge "Merge "Fix QS lock screen animation" into oc-dev am: aa2286e417 am: a86cc7098a" into oc-dr1-dev-plus-aosp
am: 29532b40c7

Change-Id: I36db47a9d2b3c7924e80eb980f2eaa6a33ecfd46