diff options
| author | Sergio Giro <sgiro@google.com> | 2016-05-19 18:10:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-19 18:10:04 +0000 |
| commit | 14c9a306ad5700c1ab320c790fc45372243f0151 (patch) | |
| tree | af45a5d25b106b30d9e867ca2836763960200b1a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 122ffb50ea660b712587952b2966c4bb63a6721c (diff) | |
| parent | 44b9f13f9cfaf2e1136a1f2baab54b229d221fe4 (diff) | |
Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev
am: 44b9f13f9c
* commit '44b9f13f9cfaf2e1136a1f2baab54b229d221fe4':
ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Change-Id: I22e0d3b3967ad205e0e9aad328790e907335ed17
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions