Merge "Don't set the same viewId twice" into lmp-dev
tree: 91dc46814442127b195a2216dcb2bd5d8af87d64
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags