Merge "Allow performShowLocked when transition animation started" into nyc-mr1-dev

am: 1fb9466c1d

Change-Id: I47692dcaef58641e1fbf6632cfb59d843c43d667
This commit is contained in:
Chong Zhang
2016-08-15 19:14:50 +00:00
committed by android-build-merger

Diff Content Not Available