OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fed2854 554cece)
am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge...
authorPaul Jensen <pauljensen@google.com>
Wed, 23 Sep 2015 14:41:57 +0000 (14:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Sep 2015 14:41:57 +0000 (14:41 +0000)
* commit '554cecea4c5e39c25efb721258366ce12e6b861c':
  Fix NOT_RESTRICTED network capability and enforce it.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help