tree f810fc570bd3f9d8210ee908c5bb60569591982c
parent 0bcac4d312a10b8c82db7d7057a1c923ce4ba13f
parent 4c33c8cd0b7cc1ccc3d445e0f6bdc8263446ed45
author Jordan Liu <jminjie@google.com> 1497035091 +0000
committer android-build-merger <android-build-merger@google.com> 1497035091 +0000

Merge "Don't use APNs xml if CarrierSettings is installed" am: aa63799915
am: 4c33c8cd0b  -s ours

Change-Id: I5bad51458b15cc130395bb8cd4df8364caf886f6