commit | 27ad75e68e7850bf1487b8a0d9fea2730dc4a2df | [log] [tgz] |
---|---|---|
author | Paul Jensen <pauljensen@google.com> | Wed Sep 23 17:42:46 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 17:42:46 2015 +0000 |
tree | e2672ca547a68f4d9dff978e68de3e2fafbbc64e | |
parent | d3ec27cc96d72ec2132646441a648ec23748e302 [diff] | |
parent | 4d8da5afaeda4867799b8029d15ea1edbade741e [diff] |
am 6a728e17: am 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev * commit '6a728e1744749a6b27e22d696b5327909e57d126': Fix NOT_RESTRICTED network capability and enforce it.