tree 92fc9b043808808d38d1d7a9516a0019dc41b556
parent e159e2b29f89239aa6af71294991fec0e0a4a3ca
parent 778745200389679158057bb1e53f3f16d13b3ef8
author Hal Canary <halcanary@google.com> 1527694172 -0400
committer Derek Sollenberger <djsollen@google.com> 1527698669 +0000

Merge remote-tracking branch remotes/aosp/upstream-skqp/release into aosp/master

Exempt-From-Owner-Approval: The fast-forward merge does not require owner approval.
Change-Id: I81b5f83ef702dba61ac22958e973c05976fdd3fe