| commit | fa10a782bdf739d0bbdee06d5b510031e9b915b5 | [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 | 3a3a652000cde0b9989c46b24866345f621796a4 | |
| parent | e8d5d152bf4862007f87f1d7732fc6f6e3671b77 [diff] | |
| parent | d04d54f843c5aa314cb0cae5ac5009bd256cecb9 [diff] |
Merge changes from topic "am-79da5bca-0ca6-42a8-8b95-7ab98d864152" into nyc-dr1-dev * changes: [automerger] MediaExtractor: stop rendering when an error occurs am: 9bc021a323 MediaExtractor: stop rendering when an error occurs