tree 3eb4d3dfbbda7d3f7100c53ff752ce01646adb22
parent 925a55c957ac36d8cc32b9729fd81a60004a1522
parent 4b90b5f884fc2f5039f4aa4aa387c48a7084d5a1
author Android Build Merger (Role) <android-build-merger@google.com> 1500421979 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500421979 +0000

Merge "Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am: 777c408a22 am: 6b0e6946c3 am: dbc78509ae" into oc-dr1-dev-plus-aosp