am fe12e8f0: Merge "Track bouncycastle upgrade to 1.51"

* commit 'fe12e8f0de6227b38365ae8681ad9df7419cc90e':
  Track bouncycastle upgrade to 1.51
This commit is contained in:
Kenny Root
2014-08-07 19:57:03 +00:00
committed by Android Git Automerger

View File

@@ -621,8 +621,12 @@ class SignApk {
this.type = new ASN1ObjectIdentifier(CMSObjectIdentifiers.data.getId());
}
/**
* This should actually return byte[] or something similar, but nothing
* actually checks it currently.
*/
public Object getContent() {
throw new UnsupportedOperationException();
return this;
}
public ASN1ObjectIdentifier getContentType() {