tree e1cb873531b3e33f3517e223edcbd1a33a30e536
parent 2d3356375a712878c6645ca9eb8b796080ca178b
parent 5f62026b4ee33d5e07c96e4afdfda9ba25a02093
author Adrian Roos <roosa@google.com> 1500649151 +0000
committer android-build-merger <android-build-merger@google.com> 1500649151 +0000

Merge "Flicker free screen-on from AOD" into oc-dr1-dev
am: 5f62026b4e

Change-Id: I70c0f6e119344358ef460c994adc6189d396400b