tree b594a97b51635e220e1ba6eb26161e613572bb75
parent 2ee6848d1446de76833ed7ddee4ce658f6c318ca
parent 9ca893de79b9318460c3c981848d2ab5997233e7
author Yin-Chia Yeh <yinchiayeh@google.com> 1506544653 +0000
committer android-build-merger <android-build-merger@google.com> 1506544653 +0000

Merge "Camera: don't hold memory map lock during callback" am: 6b1c64d32a
am: 9ca893de79

Change-Id: I7816855e7aa091958220225bad9224e9427bb478