diff options
| author | Kenny Root <kroot@google.com> | 2013-04-12 17:09:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-12 17:09:57 -0700 |
| commit | 019895e2e4744f9ddd76f5df6d59a74dbc5bcd42 (patch) | |
| tree | 0da30256c04091e98447ff6dbde8eac4088023cc /graphics/java/android/renderscript/RenderScript.java | |
| parent | 18e99d1d5f7bb2e35fb9f5c3edbb4265d66e3d93 (diff) | |
| parent | 8692685a54f6bf87dadc82fbd5576cdb81ba662b (diff) | |
am 8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev
* commit '8692685a54f6bf87dadc82fbd5576cdb81ba662b':
AndroidKeyStore: Add encrypted flag
keystore: Add flag for blobs to be unencrypted
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions