summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2015-09-23 14:41:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-23 14:41:57 +0000
commit62bb18976f3a79405897bf44bdec8f0abd855b9f (patch)
treeb794743ce81ef7ff81bd256d03d11db5210af11d
parentfed2854653d7e9d596cf1d9cb9c41ff05e744e94 (diff)
parent554cecea4c5e39c25efb721258366ce12e6b861c (diff)
downloadframeworks_base-62bb18976f3a79405897bf44bdec8f0abd855b9f.zip
frameworks_base-62bb18976f3a79405897bf44bdec8f0abd855b9f.tar.gz
frameworks_base-62bb18976f3a79405897bf44bdec8f0abd855b9f.tar.bz2
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 '554cecea4c5e39c25efb721258366ce12e6b861c': Fix NOT_RESTRICTED network capability and enforce it.
0 files changed, 0 insertions, 0 deletions