Merge change 26190 into eclair

* changes:
  KeyStore: rename scan() to saw().

keystore/java/android/security/KeyStore.java

@@ -92,12 +92,12 @@ public class KeyStore {
         return contains(key.getBytes());
     }
 
-    public byte[][] scan(byte[] prefix) {
+    public byte[][] saw(byte[] prefix) {
         return execute('s', prefix);
     }
 
-    public String[] scan(String prefix) {
+    public String[] saw(String prefix) {
-        byte[][] values = scan(prefix.getBytes());
+        byte[][] values = saw(prefix.getBytes());
         if (values == null) {
             return null;
         }