Commits
Gloria Wang authored and Android Git Automerger committed bcf74accafcM
am 9580b8ce: resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp Merge commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382' * commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382': Update of DRM framework.
Showing diff to06dfa35e3c5