tree edc1dc5e837c566d6c83164761b57f546ee692ad
parent 27a4fa10a90c754da307ddda14e16c3864dc0413
parent 3deea32a31e16d92d1d632b5a1bd260416f6e7d5
author Jean-Baptiste Queru <jbq@google.com> 1337894871 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337894871 -0700

am 3deea32a: Merge "Enable DRM support in the SDK system image"

* commit '3deea32a31e16d92d1d632b5a1bd260416f6e7d5':
  Enable DRM support in the SDK system image