diff options
| author | Dave Mankoff <mankoff@google.com> | 2019-09-13 14:39:37 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-13 14:39:37 -0700 |
| commit | 4cc8b546899dab5c69ff9e89c5ee5a8b2128eb11 (patch) | |
| tree | 6af1fa35da3bc58788f6c5003e46750d1a8827c4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7e4a7896e6ece3d9d2d5fdbd75d6821e0e66a86d (diff) | |
| parent | f2a84a6c7602bf05f3c84ef1d50808b7338a8fac (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Remove the possibility of an NPE that is being seen in master." into qt-qpr1-dev am: 421f0d367d
am: f2a84a6c76 -s ours
am skip reason: subject contains skip directive
Change-Id: I30a187e340d864f09e653a2fd37e719eea96f9b5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions