Skip to content
Commit 91b6e7c0 authored by Caitlin Cassidy's avatar Caitlin Cassidy Committed by Android (Google) Code Review
Browse files

Merge changes I0d063c25,I27d2e4ae,Ieef1681c into tm-qpr-dev 

* changes:
  [Media TTT] Remove the tap-to-dismiss option for the phone chip.
  [Media TTT] Increase the default timeout to 10s, and the timeout for the "transfer started but not finished" state to 30s.
  [Media TTT] Don't wake the screen if the screen is already in dream state.
parents 111c26fe 7c4c5375
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment