am 7d4acc53: am 69e2ef47: Merge change I9f93ce61 into eclair

Merge commit '7d4acc5316c080d8e9787d2a7c84e2a2500b85f8' into eclair-mr2-plus-aosp

* commit '7d4acc5316c080d8e9787d2a7c84e2a2500b85f8':
  Throttle camera preview frames to the app. Bug 2180302.