tree 826445c0bdebeca6e11578f4c15fe7312005325e
parent a0bd643033effaaf7bf236cd9b85b92e6260e5a3
parent 55117cd250b3c76f13fbc5f0a2b76a837a6b6564
author rongmei.li <rongmei.li@spreadtrum.com> 1544164894 -0800
committer android-build-merger <android-build-merger@google.com> 1544164894 -0800

Merge "Can't dial Emergency call when user turn on airplane mode."
am: 55117cd250

Change-Id: I39591ab7888d9b316f688602ff23f5ec3e6ecd39