Merge "Merge "Fix flicker when transiting activities without animation." into oc-dr1-dev am: afe3eb81da am: 00089101fd" into oc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
52e3c6fa15