am 65b109a2: am bace0107: Work on issue #2259506: camera ANRed and then device runtime restarted

Merge commit '65b109a246cc7c21da398ccf02083b2abd84f669' into eclair-mr2-plus-aosp

* commit '65b109a246cc7c21da398ccf02083b2abd84f669':
  Work on issue #2259506: camera ANRed and then device runtime restarted