diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-07-03 15:16:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-03 15:16:26 +0000 |
| commit | 216a0bdfb8ef365a976093a1fc4718737b28427d (patch) | |
| tree | 77439a066e8660857962acd2c0a4b900c4557887 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2d220942ce334de810780e0aeabfbf2472d42f4b (diff) | |
| parent | c20c2ea28ea755a40263545c34adffe72f675a60 (diff) | |
Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE.
am: c20c2ea28e -s ours
Change-Id: I8f51100a3429f0a604e6b93c17cd149f644b1256
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions