Commit 80868106 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "m" into marshmallow-cts-dev 

* changes:
  DO NOT MERGE: sonivox: fix hang caused by bad meta-event (cts)
  [DO NOT MERGE] CTS test for Android Security b/37093318
parents 8dc7e9b6 035f84a6
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment