commit | 6a728e1744749a6b27e22d696b5327909e57d126 | [log] [tgz] |
---|---|---|
author | Paul Jensen <pauljensen@google.com> | Wed Sep 23 17:25:45 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 17:25:45 2015 +0000 |
tree | 499b3e65ac99a552e2a735e6bca318a4212536d3 | |
parent | eb1e4b14c979b36abbd6869ee300ec69936afb55 [diff] | |
parent | 83ce299c6a676819351985c379661ae1f98e806c [diff] |
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 '83ce299c6a676819351985c379661ae1f98e806c': Fix NOT_RESTRICTED network capability and enforce it.