tree 894f81fcde791f747e50d23cd991e8c562faaae4
parent c0322107d2c954f7c1caaa8874391d80c20d5214
parent ba341487dd44a9d639501d7a86596cb33833de0a
author Fang Hui <b31070@freescale.com> 1564696537 -0700
committer android-build-merger <android-build-merger@google.com> 1564696537 -0700

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

Change-Id: Ifc221e930b1b527af9fff26dc0a2ce948c239edc