OSDN Git Service

am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev
authorPaul Jensen <pauljensen@google.com>
Wed, 5 Aug 2015 11:32:19 +0000 (11:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Aug 2015 11:32:19 +0000 (11:32 +0000)
commit41779e467a478e11de2df10ad97542e6f2d57ca7
treed2704ca106b5bc372657ad238c1ec7227e268247
parent876b82ed1e0588da3c6770df80adfdac17d4ac5a
parent952977322215b990f5aa6898bfaa40bb064545f4
am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev

* commit '952977322215b990f5aa6898bfaa40bb064545f4':
  Fix NOT_RESTRICTED network capability and enforce it.