diff options
| author | Alex Klyubin <klyubin@google.com> | 2016-06-02 00:30:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-02 00:30:09 +0000 |
| commit | f3f2ad3819e5cf6cb6fa51a7837979698a7f6448 (patch) | |
| tree | b8fa02207ad3519c0339755c0bf1990f421c24a8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 830e9045784f30a74031548da6c4fc113c7a941f (diff) | |
| parent | be28ebecb19778e3731bca4ab13a3eeb1799be7d (diff) | |
Merge "Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am: 7fe19060cf am: 815c681f42" into nyc-mr1-dev-plus-aosp
am: be28ebecb1
* commit 'be28ebecb19778e3731bca4ab13a3eeb1799be7d':
Use correct cert chain from PKCS#7 SignedData block.
Change-Id: I4407764b81619e091837481b037a6c2a0849f7a8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions