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

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