diff options
| author | Sergio Giro <sgiro@google.com> | 2016-05-24 12:14:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-24 12:14:18 +0000 |
| commit | d767eba969531b2df1ed41d82dac0853dce67cce (patch) | |
| tree | 5b497a89483d48fc9841ce4e10ac1d7ac080acff /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 930ad20ef492a02994ad8efec9821c0fb46e5ba2 (diff) | |
| parent | 163f8a2e9132b60f86f28a352ded1db6a38d367e (diff) | |
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" am: 393b67d65f
am: 163f8a2e91
* commit '163f8a2e9132b60f86f28a352ded1db6a38d367e':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: Ibb6a051e31bb52c246be990fe79495f1f7252b9f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions