tree d27278cb1f712148ca24b1de6b1bf4cedd936b88
parent 8dbfc24e5f455728f3166251504fa0b33fe17916
parent 72acefa6d81e347c909423c5377c94bcc996c3f1
author Cassie Han <xih@google.com> 1515546535 +0000
committer android-build-merger <android-build-merger@google.com> 1515546535 +0000

Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually."
am: 72acefa6d8

Change-Id: I25ad45c52cdcb9b4bf3d21f4f3b71c68e8ace362