OSDN Git Service

am 39d439fc: am 48951e4a: (-s ours) am a7b4d6dc: Merge "Keymaster digest/padding...
authorShawn Willden <swillden@google.com>
Thu, 27 Aug 2015 18:47:56 +0000 (18:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:47:56 +0000 (18:47 +0000)
commitf71f937ae555d87ad694c7918a77f543c6782cfe
treedac0c3e7fb56a41aecac39e4e0713ea791d15008
parent28e7b42b955caad30744e5bedc505d73ffce82d3
parent39d439fc43eb4005505c5099148789ace19d798f
am 39d439fc: am 48951e4a: (-s ours) am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev

* commit '39d439fc43eb4005505c5099148789ace19d798f':