Merge commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12' into eclair-mr2-plus-aosp * commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12': Work on issue 2259506: camera ANRed and then device runtime restarted
Merge commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12' into eclair-mr2-plus-aosp * commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12': Work on issue 2259506: camera ANRed and then device runtime restarted