tree 621c658f8e7beba4506ccd672996598c6400e34f
parent ee767548ba2b4d70e7c7bdc6c56dc0c6634e85d3
parent 91f6aaaf2cb1c1a0cec129cec8038332de0271a8
author Narayan Kamath <narayan@google.com> 1387458259 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387458259 +0000

am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."

* commit '91f6aaaf2cb1c1a0cec129cec8038332de0271a8':
  MediaDrm#mNativeContext is a long, not int.