am b12830aa: am fe12e8f0: Merge "Track bouncycastle upgrade to 1.51"

* commit 'b12830aa796496cbbaf058ccaa0c5c576722cb9f':
  Track bouncycastle upgrade to 1.51
This commit is contained in:
Kenny Root 2014-08-07 20:01:41 +00:00 committed by Android Git Automerger
commit cb73049485
1 changed files with 5 additions and 1 deletions

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() {