tree 282a52e6041cd6b120ce75dda3c6b9f061028578
parent 767b5ed83efe6bd7eed25e4ef2252c7367f59d60
parent 987286c2ec76f50a9a5fe53915a9ec70df6cf6f4
author Tyler Gunn <tgunn@google.com> 1513042841 +0000
committer android-build-merger <android-build-merger@google.com> 1513042841 +0000

Merge "Ensure hold tones are always played." am: fcd2dfbce2 am: 5dd184c490
am: 987286c2ec

Change-Id: I7ec931e84d8f3b293fdbaad15d6ea0f9d39fb7e2