tree 6a132bb3a902ed844c523507862f16882703e8ea
parent a0cf449854c822a8d811b1b0425dd2be3b5e6e64
parent 8a23ae4a220a9c8c744fa63e8568154ce0ec7ff1
author Yin-Chia Yeh <yinchiayeh@google.com> 1507842119 +0000
committer android-build-merger <android-build-merger@google.com> 1507842119 +0000

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

Change-Id: I6c24833ae8e5ab673848f5be11dc925427f842f0