Merge "Make PhoneAccountRegistrar state persistence null tolerant" into lmp-dev
tree: 80403664adf9f2e12096e3d949e221f07a355514
  1. libs/
  2. res/
  3. src/
  4. tests/
  5. .classpath
  6. .project
  7. Android.mk
  8. AndroidManifest.xml