tree 477c17ad5b3ce4d9f09fcf26fdb60c7a52f58cbc
parent a9daeb07be5d82d25aef6b77c9904e6c7d8113eb
parent 15493fd9c382bad416c434fe048c87fe2a2fe589
author Adam Koch <akoch@google.com> 1357930405 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357930405 -0800

am 15493fd9: am 784be44a: am a1d11945: am 6acfaccc: Bitmapfun Sample: Fix inSampleSize selection and update dependencies

* commit '15493fd9c382bad416c434fe048c87fe2a2fe589':
  Bitmapfun Sample: Fix inSampleSize selection and update dependencies