tree 6eb970906b5bc7df6cf30a0cc8669d83d965967d
parent 1519c387e782a61358d4fc8c495eba9dc59d2a91
parent 1df5ca6a71731c526d2c8834d1b0b040f1dcc76e
author Calvin Pan <calvinpan@google.com> 1541771345 -0800
committer android-build-merger <android-build-merger@google.com> 1541771345 -0800

Merge "Add CarrierId column in TelephonyProvider"
am: 1df5ca6a71

Change-Id: I35fc941a9e7b1dace0b1572976dd854227e434a5