diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-07-03 15:07:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-03 15:07:20 +0000 |
| commit | b2b73e4956fa2ffebc80893b68f37989a631eca1 (patch) | |
| tree | 2dc38dd048f1e2a224330a209bd640f743b91f9f /rs/java/android/renderscript/ProgramFragment.java | |
| parent | 19dc697f33c2cfb72ce1e8fcee51f5d4e7ed1c74 (diff) | |
| parent | c20c2ea28ea755a40263545c34adffe72f675a60 (diff) | |
Merge changes from topic 'revert-update-conscrypt' into oc-dr1-dev
* changes:
Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE.
Revert "Delete obsolete and unused KeyStoreTests". DO NOT MERGE ANYWHERE.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions