Merge "Fix missing name attribute for no favorites string." into klp-dev
tree: 9fd453be9fb7a86f04384346a3cdd26a4a4de283
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags