tree bfee5d8b247e3b80d0bbdad5fbeda7933622b8ea
parent 9783ed8f85af3d7c72030098acfed7e1d6638349
parent f31edf5d3b62f64f7395e61650b3011d21d0e6c0
author Jean-Baptiste Queru <jbq@google.com> 1284307169 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284307169 -0700

am ec06144c: am 36edb202: Merge "Make DRM libraries optional"

Merge commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415'

* commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415':
  Make DRM libraries optional