am e045e129: Merge change 26188 into eclair

Merge commit 'e045e129a98ae3a4e396abe377f1b00dff6a2460' into eclair-plus-aosp

* commit 'e045e129a98ae3a4e396abe377f1b00dff6a2460':
  keystore: rename scan() to saw().