am fcc3ff00: Merge "Delete the migrated account only when the user can\'t reconsider" into lmp-mr1-dev

* commit 'fcc3ff002421f6170f148546ab500533c6805faa':
  Delete the migrated account only when the user can't reconsider
tree: 8d63f1168ca4056a7508a2059c5a94468992ce5d
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml