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

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