commit e17682a20c0baf7ab216be6b4f19998085d6da0d
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 08 18:34:48 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 08 18:34:48 2018 +0000
tree e63be131e18cb7639ebbadcf6416aa6fa378335c
parent 2bd167ec3ca316c5ef7c380417a740e933630606
parent 7f7b75fbf5d84bd6a068ae7bd661bfe7f82168bc

Merge changes from topic "am-3bd7761d-0a22-43c4-98aa-44bfc62874ad" into oc-dev

* changes:
  [automerger] better mpeg2 TS elementary stream Access Unit parsing am: 371066d073 am: e3f5c363c5 am: 87ddba1468 am: a1284afb15 am: 127bf0250c am: 066a8f10d9 am: 5c8526df8c am: 7a013b328e am: a47fe84c56
  [automerger] better mpeg2 TS elementary stream Access Unit parsing am: 371066d073 am: e3f5c363c5 am: 87ddba1468 am: a1284afb15 am: 127bf0250c am: 066a8f10d9 am: 5c8526df8c am: 7a013b328e
  [automerger] better mpeg2 TS elementary stream Access Unit parsing am: 371066d073 am: e3f5c363c5 am: 87ddba1468 am: a1284afb15 am: 127bf0250c am: 066a8f10d9 am: 5c8526df8c
  [automerger] better mpeg2 TS elementary stream Access Unit parsing am: 371066d073 am: e3f5c363c5 am: 87ddba1468 am: a1284afb15 am: 127bf0250c am: 066a8f10d9
  [automerger] better mpeg2 TS elementary stream Access Unit parsing am: 371066d073 am: e3f5c363c5 am: 87ddba1468 am: a1284afb15 am: 127bf0250c
  [automerger] better mpeg2 TS elementary stream Access Unit parsing am: 371066d073 am: e3f5c363c5 am: 87ddba1468 am: a1284afb15
  [automerger] better mpeg2 TS elementary stream Access Unit parsing am: 371066d073 am: e3f5c363c5 am: 87ddba1468
  [automerger] better mpeg2 TS elementary stream Access Unit parsing am: 371066d073 am: e3f5c363c5
  [automerger] better mpeg2 TS elementary stream Access Unit parsing am: 371066d073
  better mpeg2 TS elementary stream Access Unit parsing