tree 88c35dde119341151cfc91e3dd2196c91b46f024
parent 6dea99f8c530333e91b063cd037bcd1cdc1e6cc7
parent 70ac1bd125184d0dd2269fc9981b58f3afc83120
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1513043002 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1513043002 +0000

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