commit | f4bb971b554733086b588077e108b2f161f748ee | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:44 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:44 2020 +0000 |
tree | 331c46c167c90faf0a16ba6c6e93e5f0e6d93d68 | |
parent | dca182d9582c3c1fa99d102ac4d62af8ca06f34f [diff] | |
parent | e51fbd6befcc15ebe6a010a46230a0def0a445ec [diff] |
[automerger skipped] Merge Android R am: 7f739a292d -s ours am: e51fbd6bef -s ours am skip reason: Change-Id I624489eaaf6df7bce7c65b31ace07d90f99a0c89 with SHA-1 32d48c8f61 is in history Original change: https://android-review.googlesource.com/c/platform/system/libartpalette/+/1422531 Change-Id: I2916f65dbc8c62c5c25633af405156defbb842b9