tree b914a63f0c3702ff90b53fd26f9b418941b31fa1
parent 4c2009c236962615c83d6c79f71532e9af2ca403
parent e31e0d5a7a3499a6a53e4cf2b0ca78325fa05396
author Tyler Gunn <tgunn@google.com> 1513042808 +0000
committer android-build-merger <android-build-merger@google.com> 1513042808 +0000

Merge "Add carrier config to always play hold tone when remotely held." am: c352f5f861 am: c9187f9199
am: e31e0d5a7a

Change-Id: Ic14315ea8a85fe9108e765fb32ce23b68ff31756