tree eab028125d40df48c03a237ca3c8d7e3c4906eaa
parent afa29f0a0d7efb7b45396c27b0e0afd880e16d13
parent 3bb060b5099122f4a0d8dd1ed211857d85ef72d3
author Jessica Hummel <jhummel@google.com> 1409756200 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409756200 +0000

am 3bb060b5: am 3da1e329: Fix bug where provisioning service could be started twice.

* commit '3bb060b5099122f4a0d8dd1ed211857d85ef72d3':
  Fix bug where provisioning service could be started twice.