diff options
| author | Narayan Kamath <narayan@google.com> | 2019-04-05 06:52:31 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-05 06:52:31 -0700 |
| commit | 7f421df3ff6f4057bcb895e6189d3993dd7881ea (patch) | |
| tree | c6a1250c23fdf23f12c20ea59d655abb462e260f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b7f11070eb6bae1490907c7fb48a3f5367f03942 (diff) | |
| parent | 70bf1bcd1bc8b5cc03c04a30d754b6eef812840e (diff) | |
[automerger skipped] Merge "Fix rollbacks in multi-user case." into qt-dev am: fb1a20e4fb
am: 70bf1bcd1b -s ours
am skip reason: change_id I1a7cf101b3bc3575421629c4bf0ff63418eb8731 with SHA1 d81ff97866 is in history
Change-Id: I0fa94ab5297cdab7a5e978824c42e276afb79c5c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions