tree 1ba1cf41e63be5c2561c534ce4675c78539d3d71
parent 89224466a6c38d498f3794bca8ed3cd7ca1887e0
parent 12a4218bd64db4526e9323ede3c6e004d3015b30
author Yin-Chia Yeh <yinchiayeh@google.com> 1507841329 +0000
committer android-build-merger <android-build-merger@google.com> 1507841329 +0000

Merge "Camera: fix use after freed error" am: b7939bbfbf am: d0cc49f98d
am: 12a4218bd6

Change-Id: If205b11101420feb9318ff26e5d85c3375f63d3d