| commit | 7ba4015c955f2ecd9433093d948e37686ef8f91a | [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 | 1bb9827d76e7f35a5e8b64097684325ea87f9f6c [diff] | |
| parent | 96a44308b69c1f098c5e5aaae01cab87ea9e10aa [diff] |
am 96a44308: (-s ours) am 10a7d744: am 734a54f6: am 9f99bc6c: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev * commit '96a44308b69c1f098c5e5aaae01cab87ea9e10aa': Fix NOT_RESTRICTED network capability and enforce it.