commit 32a951c8b0129b83497b59ff9f3ebd6128ef0bb8
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 5ead0669301425e4b902a1a5fa897cd9d24e0d2e
parent 93783a217fff280f302eb3df3e0f4729def788e9
parent 5c8526df8c485c02688aa2c02a49c1748577a59f

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

* changes:
  [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