tree 5074aa1c3346051814b6162a3f73bda04206063d
parent d28d8d9d1896e530a45a533ab873cfa7009a480a
parent b858853dc395498acc75422e568d7156062c4f9c
author Jim Miller <jaggies@google.com> 1437435486 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437435486 +0000

am b858853d: am a8f88798: am d74a3603: am 3977df03: Merge "Don\'t launch ConfirmDeviceCredentials multiple times." into mnc-dev

* commit 'b858853dc395498acc75422e568d7156062c4f9c':
  Don't launch ConfirmDeviceCredentials multiple times.