Merge commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2' into gingerbread-plus-aosp * commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2': Unhide camera fps range API and deprecate old ones.
Merge commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2' into gingerbread-plus-aosp * commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2': Unhide camera fps range API and deprecate old ones.