Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev

am: 2613fb543a

Change-Id: I82e061d321a935aed4ec9334b51c16d713991d67
This commit is contained in:
George Mount
2016-08-18 22:32:14 +00:00
committed by android-build-merger

Diff Content Not Available