OSDN Git Service

Merge "Fix wake-and-unlock animation" into oc-dev
authorAmit Pawar <amitpawar@google.com>
Mon, 12 Jun 2017 20:09:07 +0000 (20:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Jun 2017 20:09:07 +0000 (20:09 +0000)
am: 8f1d13300f

Change-Id: Ib0876be70423fa3218ffb3172f3a177c45f98681


Trivial merge