diff options
| author | Aseem Kumar <aseemk@google.com> | 2018-03-16 22:27:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-16 22:27:37 +0000 |
| commit | 3b0450d4a96b8caa24bb2ae0a8d29bfc1ff4e7d3 (patch) | |
| tree | 441f2468dbb8fd9d3a334c78003e9ade79d99b69 /rs/java/android/renderscript/ScriptIntrinsic.java | |
| parent | 6344ffd4c944bab00539cd553c6d8fd6d66a4008 (diff) | |
| parent | c1742e51378c3ec99a0e5df14dc0c77bcca0d16a (diff) | |
Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev
Diffstat (limited to 'rs/java/android/renderscript/ScriptIntrinsic.java')
0 files changed, 0 insertions, 0 deletions