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

Merge commit 'd6e86a687d57851b90d025ae33a8e4021bffe10d'

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