tree dc0bfb6258d15f46ba0e113f775caf0435c98d14
parent f4297f593116cec0e7276f2aa28ed9c47aacb711
parent ac51135d48ded504af38f0bc7fda47823419332f
author Igor Murashkin <iam@google.com> 1364408807 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364408807 -0700

am bdeaccfd: Merge "ProCamera: Fix memory leak in consumeFrameMetadata" into jb-mr2-dev

* commit 'bdeaccfdfc26f9257d2d8036381cb5e8982fa6f5':
  ProCamera: Fix memory leak in consumeFrameMetadata