tree 3b634ae5f1a10a7f616d2d94c863b9800f01825e
parent ea53021e185f757a65608fb2bba4c2cc35fb5044
parent 29119b6f5f497f9ea23662eca752a15f62768e3e
author Adrian Roos <roosa@google.com> 1500567131 +0000
committer android-build-merger <android-build-merger@google.com> 1500567131 +0000

Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev
am: 29119b6f5f

Change-Id: I71d3235402fd23ea82542bbb0957a7516ef77a66