am cadcbbf4: am f7a0c07a: am 245f8b33: Merge "Use new undemote API" into lmp-dev

* commit 'cadcbbf474fafe581474252bc0bac1e6d923de7f':
  Use new undemote API
tree: 9ff0b5f013cf6b1a844b35995b6c24af8c3c68de
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags