Merge "Clean up activity/application labels" into lmp-dev
tree: 5e07022a01c6d3333dcfecd6e076e87a44526527
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags