Commit 71d420a5 authored by Daniel Cardenas's avatar Daniel Cardenas Committed by Android Git Automerger
Browse files

am 891d8d15: Merge "Fix merge conflict in cts test AudioManagerTest.java" into lmp-mr1-dev 

* commit '891d8d15':
  Fix AudioManagerTest to handle TVs that don't vibrate and lack ringer functionality.
parents 5e4194d2 891d8d15
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