tree e772e000380b7e3672e653193063d49ea75db95a
parent 48a69096afb7138f19a744101758bcbeb28a2ca6
parent 8455068d793a4430475a3d9cdbbaf527c527d8b7
author Tyler Gunn <tgunn@google.com> 1472603823 +0000
committer android-build-merger <android-build-merger@google.com> 1472603823 +0000

Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev am: 020212c7df am: ffe4d64182
am: 8455068d79

Change-Id: I89a175703e48400c06edef679e39aaec9366af9b