tree b18fbd5fd00a79f237bb2a5f1973ab70f636ef25
parent 1da297f9f1fca52d02d09733198e4f3849782c34
parent d5ef30b223b627c21b11f2850eeb48426c74220d
author Jeff Tinker <jtinker@google.com> 1365124774 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365124774 -0700

am d5ef30b2: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev

* commit 'd5ef30b223b627c21b11f2850eeb48426c74220d':
  Implement async event callout from drm plugin to Java app