am 2d49b576: am 8533cf8d: (-s ours) Fix pessimizing move.

* commit '2d49b5763c3389f85d727730b43a78f281ab1dee':
  Fix pessimizing move.
tree: 1171e0f448d2a7cc9a592403de376f72ffb73ab1
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/