OSDN Git Service

Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am: 777c408a22
authorRobert Quattlebaum <rquattle@google.com>
Tue, 18 Jul 2017 23:43:46 +0000 (23:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 23:43:46 +0000 (23:43 +0000)
am: 6b0e6946c3

Change-Id: Ia6ceafa40c73589d516ca0d50168ba217b6af2c8


Trivial merge