| commit | 4b718184d08e3e83a9e91d6465fd349e6462227f | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 07:00:57 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:00:57 2020 +0000 |
| tree | 1899ee946516dd45e0f1e7e7f7d34f3b52089be1 | |
| parent | f6189497207bebfee025bbb6734842b9bc357532 [diff] | |
| parent | 6cef1d5364718a38bfd6d3c8e5176d8865ecf73a [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 38344cc5d1 am: e8abf8027d -s ours am: 6cef1d5364 -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: I2c03849743f409f5dcc19838c03aae6ba80ef552