tree e18bf53ba0934a3d70ccdb42d013def34551b884
parent ea0e39945f28665d2874e2f6a5fa3eb66e189737
parent 005533a92a3b56ef8bceb456063ed0ac12c767cf
author Dan Sandler <dsandler@android.com> 1415996188 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415996188 +0000

am 005533a9: Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-dev

* commit '005533a92a3b56ef8bceb456063ed0ac12c767cf':
  Trim transparent pixels off camera preview bitmaps.