Merge "Fix bug in update intents between provisioning service and activity."
tree: 593d12400c3a51859aa30d8a6a505a08bfaf34c7
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml