tree 0c188c32e8c2a9e9d2cecdd026a2d98f2cb7fd5f
parent 048f86244efd4afffbb94eb293a98d518cfc2595
parent 47c3c87c0ccac1f485c7b54e9c0c199738cd746a
author Jordan Liu <jminjie@google.com> 1525127088 -0700
committer android-build-merger <android-build-merger@google.com> 1525127088 -0700

Merge "Add Carriers.APN_SET_ID and NO_SET_SET" into pi-dev
am: 47c3c87c0c

Change-Id: I429680f2d9becaa1d4804517e40ec03925663476