tree 18fefae142edd6cc1ce351d3fea6008afee8f78e
parent e2d37b03f72986ad6faaf2d0f66ecf33e6bfb55a
parent 346b6126d54bda4ddc705b27f49004b5cf3a2b3e
author Wu-cheng Li <wuchengli@google.com> 1282665687 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282665687 -0700

am 346b6126: am 97a56269: Merge "Add camera fps range API." into gingerbread

Merge commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e'

* commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e':
  Add camera fps range API.