| commit | d2af51fabf49e7bdea23e4da79b5fd0aa0957edc | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Wed Sep 23 14:41:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 14:41:57 2015 +0000 |
| tree | 26f558ccd5835c99e3a1b7d257cbaef8924e5400 | |
| parent | 051e6413464e0c8b9ecb2431a39af86b3d5ca527 [diff] | |
| parent | bfff94358e4f35de82d3f564a3b4dcffcb8c411a [diff] |
am bfff9435: (-s ours) am 10a7d744: am 21087892: am 334c6e9a: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev * commit 'bfff94358e4f35de82d3f564a3b4dcffcb8c411a': Fix NOT_RESTRICTED network capability and enforce it.