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)
commitfb5ae0abff36bf376ad165c24bc855d8d299a977
tree73ac1f4cc44c5bfce11c7b3ecc0fbb4a443519ad
parentb08d7677d78637a83b405260ff869d2720b23daa
parent6cb5152e9f2e48c0081edabada36e0e65d3bdbf9
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev
am: 6cb5152e9f

Change-Id: Iae245cedd050379b6aad1f807e3d9b71dca221c3