tree 879005a5f5c1053171e7a8a1f18bb76aa293bf58
parent e4d6829363384f4b0b1b5907eaf98597a689a422
parent e4fb1cbd783fdc0cb0b69ea3886a62847a0e281d
author Adrian Roos <roosa@google.com> 1501191945 +0000
committer android-build-merger <android-build-merger@google.com> 1501191945 +0000

Merge "AOD: Fix flicker at end of AOD2" into oc-dr1-dev am: 3889146f82
am: e4fb1cbd78

Change-Id: I233e7bb4902eba990aac1ee410d16ccd771c1ecc