tree 51fbfb63e9bf770495ad1dc84036d99e4689df05
parent 01abec873792d290944192814029c98a6e46917a
parent 51c4a65f5cea001eb97a6914ee48901513eb6ce1
author Jinguang Dong <dongjinguang@huawei.com> 1479410841 +0000
committer android-build-merger <android-build-merger@google.com> 1479410841 +0000

Merge "Camera3: Add missing mTriggerMutex lock" am: ad4663c5a5 am: fa43b5468f
am: 51c4a65f5c

Change-Id: I0fbb1098a246db4dd2b0a6b9720dea275be23a42