tree bfc2bda0ee4e1c4e06038526174971a819c520c8
parent cc8418fc5e323c8f2fed3cd7eb035b1c06db4992
parent 05dc201ff64f6324c2726a8841af7021e7071b97
author John Reck <jreck@google.com> 1430750445 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430750445 +0000

am 05dc201f: Merge "Remove Bitmap#getSkBitmap" into mnc-dev

* commit '05dc201ff64f6324c2726a8841af7021e7071b97':
  Remove Bitmap#getSkBitmap