OSDN Git Service

Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc...
authorJim Miller <jaggies@google.com>
Mon, 8 Aug 2016 23:12:08 +0000 (23:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Aug 2016 23:12:08 +0000 (23:12 +0000)
am: 6cb5152e9f

Change-Id: Iae245cedd050379b6aad1f807e3d9b71dca221c3


Trivial merge