| commit | 2ed006842bd5a5ce21c0909080d6446e2f871b7a | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Tue May 03 16:33:08 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 03 16:33:08 2011 -0700 |
| tree | 89893129a55cf79038adfe36925ed61c6a36a08b | |
| parent | d330455c2933f4aeb2c879ef16135aeab88f831f [diff] | |
| parent | b71fa02d0da6564063667519533a0a763935ef8e [diff] |
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.