tree c8d59601538b0dfdc18d280e72e5389096619e98
parent cabae1ec3ef62104c365c4101b35f99481b8bf08
parent 3718b84a366fbd5dcf0e57c0902de03f7e709854
author Yin-Chia Yeh <yinchiayeh@google.com> 1505339794 +0000
committer android-build-merger <android-build-merger@google.com> 1505339794 +0000

Merge "Camera: fix camera status after HAL crash"
am: 3718b84a36  -s ours

Change-Id: I25e36c2c1ccfad5be4d52d29eddf2d019c741ea7