| commit | be6f0f5f0936364ff500cad2886485f82a7e736b | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Wed Sep 23 14:50:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 14:50:40 2015 +0000 |
| tree | ff77c765fc36a5b1dc46098a63213b92d88f4b03 | |
| parent | 0a6477ed3c7671ab2e941b49be57324a51333e11 [diff] | |
| parent | 7ba4015c955f2ecd9433093d948e37686ef8f91a [diff] |
am 7ba4015c: 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 '7ba4015c955f2ecd9433093d948e37686ef8f91a': Fix NOT_RESTRICTED network capability and enforce it.