| commit | 577048837fdff62c00230863e4950249c53014bd | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Feb 23 10:34:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 23 10:34:37 2021 +0000 |
| tree | 125c8f04e2b129881d3ef4712bddbbd3e80aeb02 | |
| parent | 773de47e385b22d81dc1ad92d4269b83bfef0327 [diff] | |
| parent | 99b279aeb8bf9169bb01bd4ca4996f8c3f1b1872 [diff] |
[automerger skipped] Merge ab/7061308 into stage. am: c49194457f -s ours am: 99b279aeb8 -s ours am skip reason: Change-Id I05e5688c89a206b9725d049f9395fdd773917514 with SHA-1 1a85f84502 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/13658368 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I221440194ad67a726051ac00a96f3c2dddffe514