diff options
| author | Xin Li <delphij@google.com> | 2021-03-03 23:37:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 23:37:17 +0000 |
| commit | 5a95fef4c2c0f99f0a4244641140c4bda49d2f59 (patch) | |
| tree | ca089b8a88740bfaa6b3d5007557dedf73447ae8 /camera/common/1.0/default/CameraModule.cpp | |
| parent | 0fbf87918dc0607d81d3df47810e166565f39225 (diff) | |
| parent | 913bc4bf2751ca279199fe3a66c13be63b4ad1d8 (diff) | |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 603a44d975 -s ours am: 913bc4bf27 -s ours
am skip reason: Change-Id I6eee7a4b0960b767b6620c8b93dc252422c42f25 with SHA-1 6ee1f2d8f2 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1611824
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4acac07c7c0e0903ce83375258debff8ccd38872
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
0 files changed, 0 insertions, 0 deletions