Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev

am: 6cb5152e9f

Change-Id: Iae245cedd050379b6aad1f807e3d9b71dca221c3
This commit is contained in:
Jim Miller
2016-08-08 23:12:08 +00:00
committed by android-build-merger

Diff Content Not Available