am 0357ec78: Merge "DRM API doc scrub This change contains information...
am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1
* commit '0357ec78':
DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363