| commit | f86347f54d0da443172713db0f6fc145ca5b19ff | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Wed Sep 23 17:53:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 17:53:03 2015 +0000 |
| tree | 1b65f274a1d48ddf9b2489d71c8fe6e6ead880d5 | |
| parent | 4d1b3fda4343e026b2ec80689f5747744cc86692 [diff] | |
| parent | 88674941e1cb506554e23d7f44170c5829094615 [diff] |
am 88674941: 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 '88674941e1cb506554e23d7f44170c5829094615': Fix NOT_RESTRICTED network capability and enforce it.