tree 219096bf027b38d0681c17a7493eb0d34f36204e
parent f09af68c0ad17193602195bb177300df8529dcac
parent b71fdf59837263a2533344dbecdbc0b0cce94351
author Android Merger <noreply-android-build-merger@google.com> 1528767750 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1528767750 +0000

Merge changes from topic "am-979a2aa2fa2b4fe1aa18dbf0ae3aaa16" into nougat-mr1-cts-dev

* changes:
  Merge changes from topic "am-3cdf2ccd35624e28b821e85b3120f82e" into nougat-cts-dev am: c92c0269ee
  [automerger skipped] DO NOT MERGE: sonivox: fix hang caused by bad meta-event (cts) am: 035f84a68a  -s ours am: 6a14ec962d  -s ours