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)
commit963fed0345c5bddbb15a6fd99fdee14e3765f8d1
tree56c1841e3b129f3df886c6afe24973bed565be8e
parent2f8647c4d174e58af83a23bd6e3624637970f080
parent8f1d13300f737e19d8976e0498f9c4a35acee769
Merge "Fix wake-and-unlock animation" into oc-dev
am: 8f1d13300f

Change-Id: Ib0876be70423fa3218ffb3172f3a177c45f98681