tree b8f9ad050925b7404ab31f6f2e358331ccf28616
parent 503261ce9e616b16056e54c37e1e3dfdc1077763
parent 4d9df49a128dba70b68890c81bf172c11fd40233
author Jeff Tinker <jtinker@google.com> 1366246771 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366246771 -0700

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

* commit '4d9df49a128dba70b68890c81bf172c11fd40233':
  Add new error codes for DRM to improve error reporting