tree 11288f7e4331328a1b3e8522bf360c4b389346dc
parent ecc3caffa6aae09d62f9c249aa1d104e3b20d304
parent 4dd0da999bcc0ce786c1927715f433de372a64ea
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578454966 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578454966 +0000

Merge "Add audio description information to TvTrackInfo" am: f04ee52d5a am: d0d2f7222f am: 4dd0da999b

Change-Id: I7c4646dd58be358172eaa03b97f66e9487eb9615