diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-04 01:39:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-04 01:39:07 +0000 |
| commit | f1113f93bec15061347ff78641dd6b182143ecc5 (patch) | |
| tree | 540f750917e773c357fdddb76d31b59d49e61088 /camera/common/1.0/default/CameraModule.cpp | |
| parent | 2d23831d8733e42875222c0e96983ecd43597a50 (diff) | |
| parent | 8661fe5a6bee869ef0bae99bb0442fcc3eb47a8a (diff) | |
[automerger skipped] Merge "composer: fix 2.4 vts for multi-display" am: cd563ba0c5 am: a5d5bf1338 am: 8661fe5a6b -s ours
am skip reason: Change-Id I9a69b18bcef0722e603f2ca58cfbd176ea60f5f2 with SHA-1 be3fce4193 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1515694
Change-Id: I9ac61320cc7d4dc1553741004dacc273a37ebcfe
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
0 files changed, 0 insertions, 0 deletions