tree 638135a04d3569fb3a2fa05342c248e5154e5480
parent 323dd6c9b47dd5c8dfaf843b450268dbe2e55ea9
parent fd186d20c53e8b0565f1360a71618710631eceeb
author Robert Schaub <rschaub@google.com> 1436832915 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436832915 +0000

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 'fd186d20c53e8b0565f1360a71618710631eceeb':
  docs: Changed text as requested in Android TV advertising bug, with minor cleanup