diff options
author | Sergio Giro <sgiro@google.com> | 2016-05-19 18:09:30 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-19 18:09:30 +0000 |
commit | 3eb06806429f444fe87b894308681e20e6871c7d (patch) | |
tree | d4ad10cefee44c5bcce40b73f50d0dd8c5a2cd16 /rs/java/android/renderscript/RenderScript.java | |
parent | 8f69021a908c9c805d53eefad1c4f2795d43f656 (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: Ia20b312dfd8181fadd38f075817630a1c5ab518f
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions