diff options
| author | Jordan Liu <jminjie@google.com> | 2020-11-03 00:50:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-03 00:50:02 +0000 |
| commit | b724b4794ca625a5e1545e4196048e21742ebe65 (patch) | |
| tree | 63eb44003087a6a49a2675e3ad2bbac857b8529d /camera/common/1.0/default/CameraModule.cpp | |
| parent | 1f63e34ecfb57233a6c055011213f1fdb2f4e629 (diff) | |
| parent | 3d1ad7c494b8f7ec3d21eb29abbc3dfcbe48f743 (diff) | |
[automerger skipped] Merge "Update CardState HAL and make setSimPower synchronous" am: db43f1926e am: fec6bfda0e -s ours am: f68477ab4b -s ours am: 3d1ad7c494 -s ours
am skip reason: Change-Id I0d298209a00f5f194547b0d6e368baa44b0c18ec with SHA-1 da8cd066ca is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1470181
Change-Id: Ifeedc0569e0eeaf27154b03b8bb4d48f19e473ce
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
0 files changed, 0 insertions, 0 deletions