tree b7ccba310185ebecec112c4beec1c71581c5b461
parent eefdc2c6f88b4cd2cd8e139ddfe6f1dca86945ce
parent e8107cf358bd3b56720fd2dab424566f75e422aa
author Adrian Roos <roosa@google.com> 1501764513 +0000
committer android-build-merger <android-build-merger@google.com> 1501764513 +0000

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

Change-Id: I5bafabdfe40175ee15cd3258f1e0ed536a99f164