tree 9f482ee12c333a3802f27ab511e326830130cf53
parent cd084e45fb22e0fcfcedb71424affecc2b592bf7
parent 8baff120425db46989a649c747299105f5a08029
author Nandana Dutt <nandana@google.com> 1538587193 -0700
committer android-build-merger <android-build-merger@google.com> 1538587193 -0700

[automerger skipped] Merge "Disable the buginfo dialog on AndroidTV" am: 7eaa2cbf51 am: 70509bba06
am: 8baff12042  -s ours

Change-Id: Ia21c3184690ef4b905c11c4200943579b41379cd