| commit | 28cb90171f5c695c4764ee4c2ef6cabc52f9ad3d | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Mon Jun 08 16:42:05 2020 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Mon Jun 08 16:42:05 2020 +0000 |
| tree | 36ffe6a959960f8999247768e40a2fe1813cae32 | |
| parent | 42d3a8f77f7002a15810bf53fa4fa6de9805e802 [diff] | |
| parent | 21e66a8d663fac061054d77d60be71e416a0c6a1 [diff] |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e6a4459d0 -s ours am: cce9738296 -s ours am: 8d17e5212d -s ours am: 21e66a8d66 -s ours am skip reason: Change-Id I7fe9d15b49fd2c43428e007d2af0e18a4fbf36fa with SHA-1 e3f027d5aa is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1323619 Change-Id: I466f220b640c18081cac930a89a10e05686ea747