commit | faba531278f1a020f943b71d3b4296a74a5c59b7 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 05:50:36 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:50:36 2020 +0000 |
tree | 8c464cdc944a094c477f1f701525fbffc356f561 | |
parent | 3b2a73ba084ee33fab51bf88f43ded50540f5ea7 [diff] | |
parent | de19b256efb4722f395522c20c9b3557d90ce1f0 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 9dbd87edc3 am: de19b256ef -s ours am skip reason: Change-Id Ia41629ffb2acad0754555814dafedc98500996a1 with SHA-1 3b2a73ba08 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/google/camera/+/1430143 Change-Id: I7cdbd6687eb1c17ca23328690487bcc694615d3a