commit | 41779e467a478e11de2df10ad97542e6f2d57ca7 | [log] [tgz] |
---|---|---|
author | Paul Jensen <pauljensen@google.com> | Wed Aug 05 11:32:19 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 05 11:32:19 2015 +0000 |
tree | d2704ca106b5bc372657ad238c1ec7227e268247 | |
parent | 876b82ed1e0588da3c6770df80adfdac17d4ac5a [diff] | |
parent | 952977322215b990f5aa6898bfaa40bb064545f4 [diff] |
am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev * commit '952977322215b990f5aa6898bfaa40bb064545f4': Fix NOT_RESTRICTED network capability and enforce it.