tree a509cf130d203d8bc117fe9384b3c9ecdefd0b51
parent a3a4e372dc38e3c761c606c2374095c18c702b7e
parent 52ea7733448f35ec58310b9cf1c1b492bd31a4e0
author Chia-I Wu <olv@google.com> 1539804375 -0700
committer android-build-merger <android-build-merger@google.com> 1539804375 -0700

[automerger skipped] Merge "renderengine: clamp XYZ to [0.0, 1.0] in shaders" am: 45a9d5a9b5 am: 9c325b30d8
am: 52ea773344  -s ours

Change-Id: Id1213b40cebfc8021bdfce645727394c66741430