tree b45383793ecf902ca8dafd9777d2738a9d66e610
parent 9ba4101878c5326996d02d88697051acff8cefb9
parent e9cbcf42ad6ebecc5b8bf15e4e81f100abeeedd1
author Chen Xu <fionaxu@google.com> 1509745100 +0000
committer android-build-merger <android-build-merger@google.com> 1509745100 +0000

Merge "new columns of carrierId DB" am: 9c4b4afcbc am: c5d5be72a3
am: e9cbcf42ad

Change-Id: I56ac7b277ea7c1f496291dcc8d25c6126beb346e