tree cd3aa71cd2f6ae327e798e395aad22f14610dcdd
parent 49a7c2b243ee0f0adc2d0828e430c5bfb4649111
parent 71984a0088fd803ae9211c356490cd7521078e0b
author bohu <bohu@google.com> 1531184151 -0700
committer android-build-merger <android-build-merger@google.com> 1531184151 -0700

Merge "Telephony: simplify apns-conf.xml loading logic" am: cf08863109
am: 71984a0088

Change-Id: I994b958e266c6d1ac58d64dd297aaf7b5c095cfb