am 601acb66: Switch camera allocations to the system heap.
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 2 Apr 2013 18:04:29 +0000 (11:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Apr 2013 18:04:29 +0000 (11:04 -0700)
* commit '601acb664031226cf9883908c793d364c2e07e63':
  Switch camera allocations to the system heap.


Trivial merge