am 8be85c82: Merge "Don\'t set the same viewId twice" into lmp-dev

* commit '8be85c826eb66dfd6f48b7fb79286f699d47e1cb':
  Don't set the same viewId twice
tree: eadc811576987926929db9c09f6ec6d188abab4c
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags