diff options
author | Al Sutton <alsutton@google.com> | 2019-06-07 02:28:25 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-07 02:28:25 -0700 |
commit | 284c4a249e9f62a7f1b652d64a9cca17535fc2b1 (patch) | |
tree | 867575e69b8944116e13be086c90ddba6ba5d20c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d5724eae311bfb9192eebc1191b166088b33b1df (diff) | |
parent | 64bfb0e3e71f847ce0cd42149a4204c31a8f885c (diff) |
[automerger skipped] Merge "Reconcile the backup OWNERS files with the internal repo." into qt-r1-dev-plus-aosp
am: 64bfb0e3e7 -s ours
am skip reason: change_id I42c27dfc0f3f792c46fe60e0f6807e51a2c3f21e with SHA1 a7fcdc930e is in history
Change-Id: Id4bfeba392127284684d3aa346f80caf04bc15e4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions