tree 7eedf9a5a256bcb5e13486f83f610d1673bafaf2
parent 44fc7e72c45dfa65652112ee9a29a7eeb39b7202
parent acb14bcf46ed3a2338b43f71224d8b55cb3097aa
author Chen Xu <fionaxu@google.com> 1550026713 -0800
committer android-build-merger <android-build-merger@google.com> 1550026713 -0800

Merge "Address API feedbacks for networktypebitmask" am: 307f4cfeb1
am: acb14bcf46

Change-Id: Iaeb8fade7b168bd1b9b8e0edcea4f2faf5b313a9