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

* commit '5fa591612404125aa57253623a963602b61c7d07':
tree: 995136c88be5e85b2a72ce46ef0daf48b8e3313d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags