tree a79caa1c1a57b410db465a1f0bc5a193c83f0c67
parent e0c2449d989d03f4fa4698bde3cd29deaaa01956
parent 16c9bbef978dce07f117ae679d978347a4d252b2
author Shuzhen Wang <shuzhenwang@google.com> 1547591776 -0800
committer android-build-merger <android-build-merger@google.com> 1547591776 -0800

[automerger skipped] Merge "Camera: Clarify the FMQ read order for request/result" am: 94acf41dcc am: 33541788b6
am: 16c9bbef97 -s ours
am skip reason: change_id Ia34ac69ce670b1ebeda12d92af490c347f33c15b with SHA1 17a371de6e is in history

Change-Id: Ia51b52cf3d7f88e935ca14245fcc52a6203e7cd1