| commit | 00e9c1a5bf13778b46117eab8e3d414a28c229c9 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:04 2020 +0000 |
| tree | a4c62b22c29151a3984a64c8e66b5d50405a4390 | |
| parent | 6f9bf60a51503ed73cf650c8c2a1228d246ba399 [diff] | |
| parent | 0235ede24df5351f26eb8a7c7dc6b38f0dc4fed2 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 9dbd87edc3 am: de19b256ef -s ours am: faba531278 -s ours am: 0235ede24d -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: Ic66813522908c270f2f3611353b9fe7bd990c8dc