am e3578d60: Merge change 26190 into eclair

Merge commit 'e3578d60c6fbe17c116048a6b4de60b0ac42961f' into eclair-plus-aosp

* commit 'e3578d60c6fbe17c116048a6b4de60b0ac42961f':
  KeyStore: rename scan() to saw().