tree 39f7c1da62ac392c1a3793be2550065e3b77d688
parent 6cf77a7e2b8ccacfee646f1a8abbb2e19a962081
parent 95209c5cfe562ee9cc5ec08820c0e1c1a874cbb3
author Kenny Root <kroot@android.com> 1364502262 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364502262 -0700

am 95209c5c: Merge "InvalidKeyException for "opaque" keys null getEncoded()"

* commit '95209c5cfe562ee9cc5ec08820c0e1c1a874cbb3':
  InvalidKeyException for "opaque" keys null getEncoded()