tree f45751aac99ca7eb7e06517e7da26ea7a524c70c
parent e7eb35c61da6a5641e5ea2278bb8119e0e76726d
parent 3a437c784650930b770a9eb2e9a2620e08386725
author Robert Ly <robertly@google.com> 1402968646 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402968646 +0000

am 3a437c78: am 208eb3e8: Merge "Android TV DevGuide home fix (no pic)" into klp-modular-dev

* commit '3a437c784650930b770a9eb2e9a2620e08386725':
  Android TV DevGuide home fix (no pic)