| commit | 9b9ddd01884f875f18dc6e72558a188c19a1a157 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:57 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:57 2020 +0000 |
| tree | 1899ee946516dd45e0f1e7e7f7d34f3b52089be1 | |
| parent | 119317b8130cd0cedbab0c0df1880bc2a19a3bdb [diff] | |
| parent | 5edc50fec0b09f8d77a24e09ccebc707f93106d4 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: bb33ac1f3b am: 3e98b349e7 -s ours am: 5a9ce7aa3f -s ours am: 5edc50fec0 -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: If48148a7dd4591eb5ea04c914b071a9e08911f21