tree 34f4c94c53a57410b805e64f7435a45d6b1e2718
parent f566512564b64e15ebe0c262f334c10fee7c65c9
parent 208857c3bcad68ca82d633d49ace9bee5c392cbd
author John Reck <jreck@google.com> 1425421447 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425421447 +0000

am 208857c3: am 20eeaa9c: Merge "Switch to the public NDK API for bitmap"

* commit '208857c3bcad68ca82d633d49ace9bee5c392cbd':
  Switch to the public NDK API for bitmap