tree f433a911e971e2b8371afb5a4fb25a0e17435455
parent ffe7643ec6ede2ecccefc84a400dea5e6924418d
parent 8ab184ca943f6ba72da33feac341f6eb7feebd86
author Chen Xu <fionaxu@google.com> 1509743687 +0000
committer android-build-merger <android-build-merger@google.com> 1509743687 +0000

Merge "move column defs to Telephony.CarrierIdentification"
am: 8ab184ca94

Change-Id: I229c015a1f5fc0b04c62150462d90389a3bc9cc9