tree 8c3dce85f5f48d6db03511bece5485fe56d67d8a
parent 9497ef73bcac42e27f98804b3d508fea8e55ebd4
parent b7710d07a501d5514f1242cb586aaeb53ac3ad2d
author Paul Jensen <pauljensen@google.com> 1443019162 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443019162 +0000

am b7710d07: resolved conflicts for 70dd1f77 to lmp-sprout-dev

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