OSDN Git Service

am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock...
authorGloria Wang <gwang@google.com>
Thu, 4 Aug 2011 21:47:43 +0000 (14:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Aug 2011 21:47:43 +0000 (14:47 -0700)
commit845fdba7b5a7b89571f2c85bd542c75650054544
tree2c75b25b9597204fa8dd434243d562fde4a7303c
parent23ce76ce1666e5e8b0b17825c271b133ba2626d6
parent8a6fb50d69ec40a413b117bc9145a97ec427852f
am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"

* commit '8a6fb50d69ec40a413b117bc9145a97ec427852f':
  Bug fixes in OMA DRM v1 Forward Lock Agent
drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk