tree d1b2988a3888c5add8b2bed631cc349616cb6935
parent a92c2bd845df77374f65bc68183131fbd168f20c
parent 601acb664031226cf9883908c793d364c2e07e63
author Rebecca Schultz Zavin <rebecca@android.com> 1364925869 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364925869 -0700

am 601acb66: Switch camera allocations to the system heap.

* commit '601acb664031226cf9883908c793d364c2e07e63':
  Switch camera allocations to the system heap.