diff options
| author | Ian Kasprzak <iankaz@google.com> | 2019-08-29 12:20:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-29 12:20:34 -0700 |
| commit | 1950604e40cc8d3dad5a7d3289ed1d57329f12cd (patch) | |
| tree | 47eeec8ca5e1467926c8ab5dd85a408357664771 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bfd56df44385cec5555a9f6d83702d7831dada62 (diff) | |
| parent | 4f153a21cef218b7fe03f7e709e2cefd6628b234 (diff) | |
[automerger skipped] Merge "Revert "[DO NOT MERGE] Disable com.android.preload.check.PreloadCheck#testBlackList"" into stage-aosp-master am: d5314968e6 -s ours am: 1eacc73c4e am: 1f7aa3d3d3
am: 4f153a21ce -s ours
am skip reason: subject contains skip directive
Change-Id: Idf36f3ab297e8cce303cc9dd71d92aa72de7ac25
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions