Alex Klyubin 4b79bbeaa3 am 558184f5: Merge "Make the new AndroidKeyStore API conformant."
* commit '558184f52fa7822a0bde230a93e552f137ac91a4':
  Make the new AndroidKeyStore API conformant.
2015-04-07 17:58:00 +00:00
..
2015-04-07 17:25:23 +00:00