tree 93e3388f2b427702e7b9a3cb6bece874ddb9caf5
parent 975d3a789d5a403cac66b6d9a213fb4b66a6a3a8
parent a70995f9dec3c2915792113c9c228b5b6474a915
author Eino-Ville Talvala <etalvala@google.com> 1349821680 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349821680 -0700

am dca0ac21: Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev

* commit 'dca0ac2193e87c57d871dd208073107408c13c0a':
  Camera2: Fix uninitialized parameters.