tree 72899fac8ca24212ac2700f690a881b8905880e8
parent 41a978ed3a746a110124a1e6f7765ae39862bb9a
parent ec61aba5517ba6967efafc73de06c9e4215c0ade
author Kenny Root <kroot@google.com> 1363367007 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363367007 -0700

am ec61aba5: Merge "NativeCrypto: catch null input streams in cert factory"

* commit 'ec61aba5517ba6967efafc73de06c9e4215c0ade':
  NativeCrypto: catch null input streams in cert factory