From 5f3e081504a95bde3a6ef542830307942425302f Mon Sep 17 00:00:00 2001
From: joshualitt <joshualitt@chromium.org>
Date: Thu, 20 Nov 2014 16:51:50 -0800
Subject: [PATCH] rebasing a bunch of 0% android mismatches

TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/744383002
---
 .../expected-results.json                            | 12 ++++++------
 .../expected-results.json                            | 10 +++++-----
 .../expected-results.json                            |  2 +-
 .../expected-results.json                            |  2 +-
 .../expected-results.json                            |  2 +-
 .../expected-results.json                            |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json
index d63120ff36..f6bd4ab5a1 100644
--- a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json
@@ -5852,7 +5852,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1289253105785603704
+          17492314805851855065
         ]
       ], 
       "reviewed-by-human": true
@@ -5970,7 +5970,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9298514044054867967
+          571194008531839949
         ]
       ], 
       "ignore-failure": false, 
@@ -6600,11 +6600,11 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3837254050080957005
+          5444522657787181251
         ]
       ], 
       "ignore-failure": false, 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "mixed_xfermodes_msaa4.png": {
       "allowed-digests": [
@@ -9929,7 +9929,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6159703484894621115
+          1390330092071930285
         ]
       ], 
       "reviewed-by-human": true
@@ -9956,7 +9956,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5427202237673970177
+          12228316544823599008
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
index d24ba80e21..99a0f5a975 100644
--- a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
@@ -5844,7 +5844,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1957932111000441191
+          167979044054175148
         ]
       ], 
       "reviewed-by-human": true
@@ -6592,11 +6592,11 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3837254050080957005
+          5444522657787181251
         ]
       ], 
       "ignore-failure": false, 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "mixed_xfermodes_msaa4.png": {
       "allowed-digests": [
@@ -9912,7 +9912,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6159703484894621115
+          1390330092071930285
         ]
       ], 
       "reviewed-by-human": true
@@ -9939,7 +9939,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5427202237673970177
+          12228316544823599008
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
index 11debf64a1..d5d4b4784d 100644
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
@@ -6967,7 +6967,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16032998155901562309
+          10945059419634267896
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
index 11debf64a1..d5d4b4784d 100644
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
@@ -6967,7 +6967,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16032998155901562309
+          10945059419634267896
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
index d9cc04a0c3..e39b5c6647 100644
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
@@ -6993,7 +6993,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2821324657480979296
+          421029453056073517
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
index 9998d779f5..26cc5fde1f 100644
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
@@ -6993,7 +6993,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2821324657480979296
+          421029453056073517
         ]
       ], 
       "reviewed-by-human": true