| commit | ca615748cf9944d65233bd9a1a9fd5d6ac7befe1 | [log] [tgz] |
|---|---|---|
| author | Jason parks <jparks@google.com> | Fri Jan 21 12:39:55 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 21 12:39:55 2011 -0800 |
| tree | 4a106745d8cd649aef6bb6c2e4ca060c3c37241e | |
| parent | 18e9cf0faaa946540fd5eef33e6125b1c5794aa9 [diff] | |
| parent | a55e367027fcd37aae83bf3e61225c45db0cf1cf [diff] |
am a55e3670: am 0512d080: Merge "Add and enforce the permission for encrypting/decrypting." into honeycomb * commit 'a55e367027fcd37aae83bf3e61225c45db0cf1cf': Add and enforce the permission for encrypting/decrypting.