tree 6880fafe7954e1bd05a3218cd447c7144141866c
parent 2fe945c3a916430d1ba33824e6452dd48c5f13c8
parent d3e78478aa2e548ab857aa6549964bffd5803e39
author John Reck <jreck@google.com> 1496854152 +0000
committer android-build-merger <android-build-merger@google.com> 1496854152 +0000

Merge "Clear native shader when Paint shader changes" into oc-dev
am: d3e78478aa

Change-Id: I7d96db34b1894e1064116b830a8fb159ad4c57b0