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

* commit 'b7710d07a501d5514f1242cb586aaeb53ac3ad2d':
  Fix NOT_RESTRICTED network capability and enforce it.
tree: 8c3dce85f5f48d6db03511bece5485fe56d67d8a
  1. Android.mk
  2. CleanSpec.mk
  3. README.txt
  4. src/
  5. tests/
  6. tools/