40a26e806193943e62dc5794ec7d762b9fa41111 - platform/cts

commit	40a26e806193943e62dc5794ec7d762b9fa41111	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Mon Apr 09 22:29:41 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Mon Apr 09 22:29:41 2018 +0000
tree	bb30d9716be879e447fd8b6b943eab3bfed33c19
parent	269236e6e39d0cdcfcf20559a42d4b118f67207b [diff]
parent	b1fd494ac79474c283749d3690bcd91f710219ac [diff]

Merge changes from topic "am-5890cfea-88fc-411b-af3e-af10717509d7" into nyc-mr1-dev

* changes:
  [automerger] sonivox: fix hang caused by bad meta-event (cts) am: 7144f3ff11 am: cd7e613ed9 am: dd88adcf51 am: 081ada24db am: 0fb1149686 am: 5c47bacaf0
  [automerger] sonivox: fix hang caused by bad meta-event (cts) am: 7144f3ff11 am: cd7e613ed9 am: dd88adcf51 am: 081ada24db am: 0fb1149686
  [automerger] sonivox: fix hang caused by bad meta-event (cts) am: 7144f3ff11 am: cd7e613ed9 am: dd88adcf51 am: 081ada24db
  [automerger] sonivox: fix hang caused by bad meta-event (cts) am: 7144f3ff11 am: cd7e613ed9 am: dd88adcf51
  [automerger] sonivox: fix hang caused by bad meta-event (cts) am: 7144f3ff11 am: cd7e613ed9
  [automerger] sonivox: fix hang caused by bad meta-event (cts) am: 7144f3ff11
  sonivox: fix hang caused by bad meta-event (cts)

tree: bb30d9716be879e447fd8b6b943eab3bfed33c19