tree 91895c16f120ad0b08807b864208601d630e2009
parent d2b1b0daa08f5db54fec3c7fa8db5bbecfd0a224
parent afe3eb81da4c2aa6648d50d0151080ff5b076aad
author Rob Carr <racarr@google.com> 1500575510 +0000
committer android-build-merger <android-build-merger@google.com> 1500575510 +0000

Merge "Fix flicker when transiting activities without animation." into oc-dr1-dev
am: afe3eb81da

Change-Id: I94ef9796fe00b3e1ce1312e1f038b1d73456310d