tree a89056f4f3e8815be80dfe2de03965e4bf66625d
parent 985fad4d15766747eaa2515d145da3492541e5f4
parent 6efe4863973a3fd877cfcbe3a850021fb3bdf09e
author Adrian Roos <roosa@google.com> 1501176180 +0000
committer android-build-merger <android-build-merger@google.com> 1501176180 +0000

Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev
am: 6efe486397

Change-Id: I016efc215fa8fcf66a814f7cdf25a8ae0cc13e75