diff options
author | Lucas Dupin <dupin@google.com> | 2019-06-07 20:08:04 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-07 20:08:04 -0700 |
commit | f2a8b5efcdf60e4dc68d6f474b8b0952425b346e (patch) | |
tree | 563501b2c6f0fd8dc458891be2afba0482ffde8d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 91eb8c505961aa862700af9513d2805fa2189d26 (diff) | |
parent | 0f9c0cf7bbc95300184978bca1d049fa11dbcb92 (diff) |
[automerger skipped] Merge "Remove obsolete state" into qt-dev am: 47b4c6d5df -s ours
am: 0f9c0cf7bb -s ours
am skip reason: change_id I17fcd9eb5eba7e7bc88de09309f5c310fe13433f with SHA1 de8c25ac2d is in history
Change-Id: I34f61b0794fe72e21d9efdfacd68b113f186c02e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions