| commit | a0489b091ab827dea4a803de2bda5d8154a098d0 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 14 21:50:56 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:50:56 2020 +0000 |
| tree | a4c62b22c29151a3984a64c8e66b5d50405a4390 | |
| parent | 67cec2102f75a089d64552313b2c83777ed47421 [diff] | |
| parent | 3b2a73ba084ee33fab51bf88f43ded50540f5ea7 [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: e30d150fe7 -s ours am: 3b2a73ba08 -s ours am skip reason: Change-Id Idb60d6e69d53255a5242be5f09e770052353994a with SHA-1 d5793fefea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/camera/+/12579484 Change-Id: I942b4cb77db78abfe75284dbe2aa380963c9820a