tree 4e3a1b0ca6b579a394f1b7655a495f6e22912752
parent 40336782eaa797bca3d1487784af113ba3b143ff
parent 70246ebb9b1a3c192caf7e001b45dafbdb6bbc30
author Android (Google) Code Review <android-gerrit@google.com> 1246518981 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1246518981 -0700

Merge change 5615 into donut

* changes:
  Implement the generic mini-keystore for security.