am 7fffb19f: am 12ef4ba4: am 8c195ad7: Merge "Implement addAuthToken"

* commit '7fffb19f1a0f6da7c051299b6a69504f7078ab20':
  Implement addAuthToken
tree: fa6a10835b5f6b569e0982935f2648733fa9af5f
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/