am 33aa35f1: libgscaler: enable/disable hardware content protection during drm playback
authorDima Zavin <dima@android.com>
Fri, 12 Oct 2012 18:04:13 +0000 (11:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Oct 2012 18:04:13 +0000 (11:04 -0700)
* commit '33aa35f1c81c92e5b44ddc898fed85ad39e1908b':
  libgscaler: enable/disable hardware content protection during drm playback


Trivial merge