commit 48dcdf9a7856d49eeecbaa13f9ed81601eb8e2fa
author Atanas Kirilov <akirilov@google.com> Wed Jul 11 22:45:05 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 11 22:45:05 2018 +0000
tree 1843e8b192ca8863c8516092bfac448d97f450ad
parent 77c35f6caca40daa67842842575796e74fff758b
parent f88d8ba86a87c1e02c2062271a4404448b20aa1f

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

* changes:
  [automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323 am: d04d54f843 am: 73bc1230e7 am: 70c597fe88 am: 0bfabbf53d
  [automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323 am: d04d54f843 am: 73bc1230e7 am: 70c597fe88
  [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