commit | 9180e2ea5916d43caf998d0fa7bf7ac70c575c4e | [log] [tgz] |
---|---|---|
author | Paul Jensen <pauljensen@google.com> | Wed Aug 05 11:44:46 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 05 11:44:46 2015 +0000 |
tree | 986c75ab8e5c8a410b1e57f69b90f0cda266b525 | |
parent | 5fecc6cf032bbbc2616dd2342a50656bf2857832 [diff] | |
parent | abd27102f4e232be448bc6012e0bd833637ab3fa [diff] |
am abd27102: am 41779e46: am 95297732: am 86e7d135: resolved conflicts for merge of dbc4edcc to mnc-dr-dev * commit 'abd27102f4e232be448bc6012e0bd833637ab3fa': Fix NOT_RESTRICTED network capability and enforce it.