Merge "Fix scissor tests failing on 565."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 3 Apr 2015 21:25:40 +0000 (21:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 3 Apr 2015 21:25:40 +0000 (21:25 +0000)

Trivial merge