tree 34f4c94c53a57410b805e64f7435a45d6b1e2718
parent 55f541bd4352ac2c6e0dcd8a40e15e115d0e895b
parent 20eeaa9cdee7aa28d456f4a7ac3d494950c5aa1a
author John Reck <jreck@google.com> 1425397342 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425397342 +0000

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

* commit '20eeaa9cdee7aa28d456f4a7ac3d494950c5aa1a':
  Switch to the public NDK API for bitmap