diff options
| author | Wink Saville <wink@google.com> | 2011-05-03 16:33:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-03 16:33:08 -0700 |
| commit | ee081bf5ee936396a89d5bd2b29487047b260f49 (patch) | |
| tree | 8bd4e6ed2c0ff775dfaff730f40189ee714f5999 /graphics/java/android/renderscript/RenderScript.java | |
| parent | 2d40bf91e6ad71505ec84743c5ad0b854ecf5928 (diff) | |
| parent | 3ed0a1ec7aa6364c236721a1bd29fd196f259cba (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.
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions