tree 7735a59806145da3ac76fd6800d9c766f5c2f3af
parent e1ac6911ff70b7922fbbccb390a7fa0251606b00
parent 353a2c1661b2b7f4a83cab393d19df38e04870c5
author Alex Ray <aray@google.com> 1368057533 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368057533 -0700

am 353a2c16: Merge "camera: Fix NPE in FOV test" into jb-mr2-dev

* commit '353a2c1661b2b7f4a83cab393d19df38e04870c5':
  camera: Fix NPE in FOV test