tree 89893129a55cf79038adfe36925ed61c6a36a08b
parent d330455c2933f4aeb2c879ef16135aeab88f831f
parent b71fa02d0da6564063667519533a0a763935ef8e
author Wink Saville <wink@google.com> 1304465588 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304465588 -0700

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.