am a2042339: am 06107886: Merge "Remove layout and logic for unused non-tiled favorites"

* commit 'a2042339c3a9f5b987b95f387e80dde10d7e5e6a':
tree: 967f2714b7c695a2c8690d8099672ae2c639bbb8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags