OSDN Git Service

am 48951e4a: (-s ours) am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer...
authorShawn Willden <swillden@google.com>
Thu, 27 Aug 2015 09:21:50 +0000 (09:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:21:50 +0000 (09:21 +0000)
commit39d439fc43eb4005505c5099148789ace19d798f
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent2572a05005f6aff22a9c5c34cb1a2a4f2266d2a1
parent48951e4a80dfa576993b5fd1d9c8e13608b3e6a4
am 48951e4a: (-s ours) am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev

* commit '48951e4a80dfa576993b5fd1d9c8e13608b3e6a4':