commit 2e4e140b1257a9f335b3b18cf06111e75669fa74
author The Android Automerger <android-build@android.com> Fri Dec 07 13:25:59 2012 -0800
committer The Android Automerger <android-build@android.com> Fri Dec 07 13:25:59 2012 -0800
tree da74de5895da6e105e6828c10bab2d96c4548741
parent 5c2bfc929bf2547f4ef2c70518ed4172a2fe31ec
parent 9351269eae866a513e058796c6a4aecb8ecb7ee2

merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

proprietary-blobs.txt

diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index 5974562..5e18358 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -167,4 +167,9 @@
 /system/vendor/firmware/discretix/dxhdcp2.b02
 /system/vendor/firmware/discretix/dxhdcp2.b03
 /system/vendor/firmware/discretix/dxhdcp2.mdt
+/system/vendor/firmware/keymaster/keymaster.b00
+/system/vendor/firmware/keymaster/keymaster.b01
+/system/vendor/firmware/keymaster/keymaster.b02
+/system/vendor/firmware/keymaster/keymaster.b03
+/system/vendor/firmware/keymaster/keymaster.mdt
 /system/vendor/lib/libdrmdecrypt.so