tree 3d8ed4cf5fc62f2044796c108a315a415ab0b270
parent 4fd4882b07c3f959ccab91cdcff644d338f77480
parent b63aa8a99754351aa7b35e9cf5d6fb8a4b167731
author Robert Schaub <rschaub@google.com> 1436894186 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436894186 +0000

am b63aa8a9: am 37621e24: am 92573764: am fd186d20: am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs

* commit 'b63aa8a99754351aa7b35e9cf5d6fb8a4b167731':
  docs: Changed text as requested in Android TV advertising bug, with minor cleanup