tree 69863810836d39c4bf75afe57c82d3c9f9c1232d
parent 75c664582c5ce5d94826f37cb725b447a4d62c50
parent 0e7b5a0287ef4a3dde2b29b4a2421679f88965e0
author Wink Saville <wink@google.com> 1304464798 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1304464798 -0700

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