tree ab12363034442b0714831529fef8baf90e7ac8c4
parent d4031658b0beb96e24037d485c2c30e4fea6c7bc
parent 23274614dab35cc56f4239378ef48d6f5a17aacd
author Cassie Han <xih@google.com> 1515548009 +0000
committer android-build-merger <android-build-merger@google.com> 1515548009 +0000

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

Change-Id: Id1b1667359a45259aea7d32cf7426f843ba0f33f