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


Trivial merge