am faa14adf: Merge "Clean up activity/application labels" into lmp-dev

* commit 'faa14adf81b18e49102020f035893c9aa71aa867':
  Clean up activity/application labels
tree: 064f42bfe64b53891a53e49f7ce873f686958750
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags