am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE

* commit '3ed0a1ec7aa6364c236721a1bd29fd196f259cba':
  IMS: Provide net_admin permission so that IPSec could be configured/used.
This commit is contained in:
Wink Saville 2011-05-03 16:33:08 -07:00 committed by Android Git Automerger
commit 2ed006842b

Diff Content Not Available