| commit | 952977322215b990f5aa6898bfaa40bb064545f4 | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Wed Aug 05 11:24:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 05 11:24:18 2015 +0000 |
| tree | 3dbb50972a58839d556a1a39022c2170e8e13632 | |
| parent | 37b1843417b1362530b51b1d5c5f8bda06a7c92e [diff] | |
| parent | 86e7d135acbdb0055de6a687817d44ac60603c9f [diff] |
am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev * commit '86e7d135acbdb0055de6a687817d44ac60603c9f': Fix NOT_RESTRICTED network capability and enforce it.