| commit | 5a9ce7aa3f8f467d16152b0e0533df82e8d9e3b1 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:51:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:51:28 2020 +0000 |
| tree | 1899ee946516dd45e0f1e7e7f7d34f3b52089be1 | |
| parent | 6cef1d5364718a38bfd6d3c8e5176d8865ecf73a [diff] | |
| parent | 3e98b349e76d90a1310542d850be36c33a6c80f9 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: bb33ac1f3b am: 3e98b349e7 -s ours am skip reason: Change-Id I280ae3c2f68a9d42f327fb7fe876630e1d9aedad with SHA-1 87f2864533 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/1431517 Change-Id: Ifa8359f0983395caa78a0ef0bbd6c7402207155b