tree 32122598c459e7a14e88959f6e3189f8b6b5cd96
parent bf1b9057cd06551381d643faff775e741d9d300b
parent 714e392037834a1d183609745e69d3cfc2d26985
author Igor Murashkin <iam@google.com> 1368126299 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368126299 -0700

am 7fe6ac0d: Merge "camera2: Add height to the crop region metadata property" into jb-mr2-dev

* commit '7fe6ac0de4b36f89a7f20dafb693e814344f9b4d':
  camera2: Add height to the crop region metadata property