am 2b9ba699: am 9e7ee617: Add extra checks and timeouts to account migration. DO NOT MERGE

* commit '2b9ba6997cd8353e17c673701f31c11d2ddee11e':
  Add extra checks and timeouts to account migration. DO NOT MERGE
tree: 8663f57ec54d72f4110cab01a3ed51266da197ea
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. CleanSpec.mk