tree 05cbf3106bfecaa475bd48ba1fd0bedf3743bc09
parent 9f730941871f7ee470a8d04d88644086378e4373
parent 0d6f8dfbbbe1f174e47624306d014a1af0003b5e
author Shawn Willden <swillden@google.com> 1440677851 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440677851 +0000

am 0d6f8dfb: (-s ours) am 3ac35814: Merge "Use minimum 20 bytes salt for RSA PSS." into mnc-dev

* commit '0d6f8dfbbbe1f174e47624306d014a1af0003b5e':