tree ccd5ea74521fcbb63933f806c854e56177108092
parent 2c1e641080ff62b6d333aea7c34482f66fdbaead
parent 6f332d5b4a8de406bb00a4b20ae6b0b9878fa9b0
author Adrian Roos <roosa@google.com> 1501003340 +0000
committer android-build-merger <android-build-merger@google.com> 1501003340 +0000

Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev am: 9ffa87552b am: 64aa52c135
am: 6f332d5b4a

Change-Id: I720e1cb9217efcfa3cbfe97a3cfe91c9c2d3f688