commit | fd8da9c45dd1a08497272f94dbad141903aad81c | [log] [tgz] |
---|---|---|
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 | e6a4d977a7ae5e26c5df9ef83f91f5146a52a35f | |
parent | 1ff39c654ab9d594a807f6327e1a28c67517173d [diff] | |
parent | 73bc1230e7b4d49ec5fc1765d1768dd1ab0ca7a6 [diff] |
Merge changes from topic "am-79da5bca-0ca6-42a8-8b95-7ab98d864152" into nyc-mr1-dev * changes: [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