OSDN Git Service

Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev
authorAdrian Roos <roosa@google.com>
Thu, 20 Jul 2017 16:12:11 +0000 (16:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 16:12:11 +0000 (16:12 +0000)
am: 29119b6f5f

Change-Id: I71d3235402fd23ea82542bbb0957a7516ef77a66


Trivial merge