tree 69b1965c1c9eab5e9be6cb62bf5b4f77dd773a61
parent a77de00d5aae158f9cccf496c3354fe98e21dcd6
parent d4dd8991ca8a2e0fc5a4d364ecb287290ee272fb
author Jordan Liu <jminjie@google.com> 1497029108 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1497029110 +0000

Merge "Don't use APNs xml if CarrierSettings is installed"