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