tree dfa565140f3fa2305e66515633cca91210d3b545
parent 7c335a5d575470ba944cb41d0ac655d7087422d1
parent dc814878daabaa8d670272028b358634eb695e16
author Sergio Giro <sgiro@google.com> 1468953823 +0000
committer android-build-merger <android-build-merger@google.com> 1468953823 +0000

GCMParameters: in ASN1 encoding, use 12 when no value is specified am: 48c093f131 am: b529b45d02 am: 11297dc70a am: 15f85eeba9 am: 7148f9f891 am: 485552e5d2 am: c47471be71
am: dc814878da

Change-Id: I470e04d374d859355fefe83a830eadf233e21655