tree a296edce2d4d1bba1f5e59853f74a7ec75bafce6
parent b224b318a03f794fa378e488f6844f8a1e66e7e7
parent 3a764c19d1fc7bbe72231c212dfbae1ef40f83f6
author Etan Cohen <etancohen@google.com> 1489165400 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1489165401 +0000

Merge "[AWARE] Update network API: make open/encrypted explicit"