tree 1eea3b6ddcdad79ad2d4a39aa412511c588fe178
parent 9c54cca8444bd00bba5173815d3029d45f244960
parent ceea0c8dd91e889b5e4b7d852ce0330e435c9981
author Igor Murashkin <iam@google.com> 1349719040 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349719040 -0700

am 97f00a6b: am e18c1cce: Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev

* commit '97f00a6b6cde4837e0ab3751d7cfd2921c11f9b4':
  Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras