Merge "Don't undemote contact on UI thread" into klp-dev
tree: e92714f812f7db1141791d2c17a8cd54dd2f66d5
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags