commit | 9d7981e4459db3c92b43feec0def83e359c70027 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jun 11 18:59:53 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 11 18:59:53 2020 +0000 |
tree | 865b6bded5c4b45bfb769d2eeebd64e5ac8c7b1d | |
parent | 96f8d96fddc4c352b0236f75a555a74ee0cf898b [diff] | |
parent | daeb87e63e7ece14c4b4b3856047e54ed9612e1a [diff] |
[automerger skipped] Merge changes I089f3922,I3a52a472 am: a194bc71da am: db256262aa -s ours am: 34332e46ac -s ours am: daeb87e63e -s ours am skip reason: Change-Id I089f3922ac6f9a5ccffdc672aceeed0e4a99fcb0 with SHA-1 c9e8366659 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1318832 Change-Id: I95d0723e8222346d2def19bc979f669307301601