tree d75123cba56948ee6b27ec41847b4c53e298bd8e
parent 3403673123f70c93d9fca457fefa571ebb134fb9
parent b9afae2e50c0240ee103ab44fad13b75aef985b6
author Adrian Roos <roosa@google.com> 1503353225 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1503353225 +0000

Merge "AOD: Only play wakeup animation when actually waking up" into oc-mr1-dev