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