OSDN Git Service

Merge "[AWARE] Update network API: make open/encrypted explicit" am: 3dee29581e am...
authorEtan Cohen <etancohen@google.com>
Fri, 10 Mar 2017 17:28:49 +0000 (17:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Mar 2017 17:28:49 +0000 (17:28 +0000)
commit5fec44183c1d993ca19f73d4215b481ad764bd46
tree161534cf5ea73e32d996812637ef3548241aa156
parentc9201b077bb23e6cf079eb68cb83b9f11e7113c5
parentdff2c71b86b0ae6d890eeb87788bfeb64ebb2757
Merge "[AWARE] Update network API: make open/encrypted explicit" am: 3dee29581e am: 652aa82d7e
am: dff2c71b86

Change-Id: I0069a17cd38d628a53de46c42b3a0adb82b577b5
api/current.txt
api/system-current.txt
api/test-current.txt