tree f356d1caefeb8e1d6731bd310209fba91896ac77
parent 0b403ebd6aecdf6691c4df009c791096d734aeb0
parent 28006a3b31d1cd3765568ceed211f8bc8de9c50c
author Robert Schaub <rschaub@google.com> 1436831889 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436831889 +0000

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

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