tree 52d09523388c566df987e920f8991a8b60d43b3f
parent 43b1c442f0a6ccfcfe0e1976ff6e5534e62ca166
parent b8fb0f9d05169a396e5bcfe5c242836156c55dfe
author Adrian Roos <roosa@google.com> 1501765805 +0000
committer android-build-merger <android-build-merger@google.com> 1501765805 +0000

Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am: e8107cf358 am: 5398051267
am: b8fb0f9d05

Change-Id: Ib06fa5782299fcada3a27c3b6d3d4d7ac3ef3d31