commit 9effd2d8c90f4e21fd4cada381c8a46bcfd9116d
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jan 31 21:24:57 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 31 21:24:57 2018 +0000
tree 0a99a97e8f68fa23ac3b678d1cdccef25cc2a9da
parent 7adc0cb8e349ec4f585330b84ab3f5a1479648ee
parent 34e5734b43879bdec2c0135c888df23c47c6cff5

Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into nyc-mr1-dev

* changes:
  [automerger] Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a am: a53573889c am: 49f05ac885 am: 50a7d473f0 am: f5e1ab69db am: 4b95010577
  [automerger] Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a am: a53573889c am: 49f05ac885 am: 50a7d473f0 am: f5e1ab69db
  [automerger] Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a am: a53573889c am: 49f05ac885 am: 50a7d473f0
  [automerger] Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a am: a53573889c am: 49f05ac885
  [automerger] Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a am: a53573889c
  Merge "Decoder: Fixed reset values in parse sps." into mnc-dev am: 78f1152a7a