diff options
| author | Xin Li <delphij@google.com> | 2021-03-04 00:12:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-04 00:12:18 +0000 |
| commit | a9901201038e2c775cb62f1fdc8292bd4e4f7926 (patch) | |
| tree | 646eff0b67cf35681eb109edd5adbb8f61603db7 /camera/common/1.0/default/CameraModule.cpp | |
| parent | 6af85f1552b5ef24d44b17e15e65bc66b74b6f0c (diff) | |
| parent | 5a95fef4c2c0f99f0a4244641140c4bda49d2f59 (diff) | |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 603a44d975 -s ours am: 913bc4bf27 -s ours am: 5a95fef4c2 -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: I330cb26c550108a80da7fa876590fe53cae5766a
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
0 files changed, 0 insertions, 0 deletions