tree 407c73da7372199c6bf4c7c1be0dac064348a8c6
parent acd69364cac252c9ec0c4aaa48ad8e8f01d11662
parent d83c791239fba8780d4593528f50d21cb50eba7e
author Eino-Ville Talvala <etalvala@google.com> 1349303145 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349303145 -0700

am a9438d09: am ce953ce4: Merge "Camera2: Properly update FPS range when FPS is set." into jb-mr1-dev

* commit 'a9438d09fb44f6c95a558accd05711600cc4b2bf':
  Camera2: Properly update FPS range when FPS is set.