tree 83a452052c6df2b2c36b56ab81c30a618a814381
parent 7c41ddb9750c74541d4df9134064f418dd347fe8
parent 67b29d5d498a497cf5164e0f840b30a8d197f716
author Amit Pawar <amitpawar@google.com> 1497297651 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497297656 +0000

Merge "Fix wake-and-unlock animation" into oc-dev