am 83ce299c: am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '83ce299c6a676819351985c379661ae1f98e806c':
  Fix NOT_RESTRICTED network capability and enforce it.
tree: cbcc19f512d92178b25da7ab9ce04eaaabc3ae16
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py