tree ee376e74ee759cf465c4eece1324879e0da3fe8d
parent e5d3086f3b22ebb478e453003711915b9ec690a0
parent 70c597fe888ab884e274f678394c35c8077c14b7
author Atanas Kirilov <akirilov@google.com> 1531349105 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1531349105 +0000

Merge changes from topic "am-79da5bca-0ca6-42a8-8b95-7ab98d864152" into cw-f-dev

* changes:
  [automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323 am: d04d54f843 am: 73bc1230e7
  [automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323 am: d04d54f843
  [automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323
  MediaExtractor: stop rendering when an error occurs