tree 894f81fcde791f747e50d23cd991e8c562faaae4
parent 6a646b7bbb11c1e6db7db67a5c0f9f675edaef08
parent 450c236e72b6b26c30a4876845bb6244541a8f50
author Fang Hui <b31070@freescale.com> 1564695321 -0700
committer android-build-merger <android-build-merger@google.com> 1564695321 -0700

Merge "Camera application exits if take picture after suspend/resume"
am: 450c236e72

Change-Id: I25d8caaeba288ec6c436063cd2c18a26ac657d96