diff options
author | Robin Lee <rgl@google.com> | 2014-06-09 14:47:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-09 14:47:04 +0000 |
commit | a54c8246a58a1ae5ca3c364c0469f82ba8994a1b (patch) | |
tree | 2c357274815d543581371aa52ea40f0763f4168a /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | f89fa8337466be97e40c3ae3cc37704e3f666b5e (diff) | |
parent | 0b889cd66fdb739a8078fb50212501849e35eb1e (diff) |
am 0b889cd6: am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"
* commit '0b889cd66fdb739a8078fb50212501849e35eb1e':
Choose CA certificate storage according to userId
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions