[automerger skipped] Leanback support for Traceur am: 4af3e66775
am: bf6032046f  -s ours

Change-Id: I54bb3617910aea75489a6f4361f6aa2f3fefdb18
tree: c6d40753f35df2fe336096591a024ae13737b380
  1. res/
  2. src/
  3. uitests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags