tree 1d7dc40888d00b25724c1b82e63ea26521737fab
parent 6fb9316f6bd72b406bbfc61bd210281744eea9c1
parent ef8a810b3b11d177a64111125eaa44bb76624414
author Gloria Wang <gwang@google.com> 1288735191 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288735191 -0700

am ef8a810b: Merge "Update of DRM framework"

* commit 'ef8a810b3b11d177a64111125eaa44bb76624414':
  Update of DRM framework