tree e8e7bcfeec624fd425cff8e886a79d18aa675cb4
parent 4707c9b04891e5cf7772de74e9c229bce028c87d
parent 64595e6727c478d3d80c7babbecdb470398f8c42
author Jeff Tinker <jtinker@google.com> 1366246599 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366246599 -0700

am 64595e67: Merge "Add new error codes for DRM to improve error reporting" into jb-mr2-dev

* commit '64595e6727c478d3d80c7babbecdb470398f8c42':
  Add new error codes for DRM to improve error reporting