tree 886e94bf18abc7cb122775a0d7102e866f0482e1
parent 61f5fb5025b6b62940cd4edf809a617d124b4f42
parent 5dd184c490c0c5b1e91705b1a7edbf79e6b73675
author Tyler Gunn <tgunn@google.com> 1513042035 +0000
committer android-build-merger <android-build-merger@google.com> 1513042035 +0000

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

Change-Id: I9e12d5af3666df69a65229aa34e898799376a471