summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2015-09-23 14:50:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-23 14:50:40 +0000
commit83ce299c6a676819351985c379661ae1f98e806c (patch)
treeeae61e2e254c64fcf48cba70f5330098cf1a8ecf
parent9c5e49b713db3ddf12d90d8cff9c2e8191a3667d (diff)
parent62bb18976f3a79405897bf44bdec8f0abd855b9f (diff)
downloadframeworks_base-83ce299c6a676819351985c379661ae1f98e806c.zip
frameworks_base-83ce299c6a676819351985c379661ae1f98e806c.tar.gz
frameworks_base-83ce299c6a676819351985c379661ae1f98e806c.tar.bz2
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 '62bb18976f3a79405897bf44bdec8f0abd855b9f': Fix NOT_RESTRICTED network capability and enforce it.
0 files changed, 0 insertions, 0 deletions