commit | 95e7eba65a68d0209023930325db5a2bf7dd77ac | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Mon Nov 30 15:01:45 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 30 15:01:45 2020 +0000 |
tree | 9d4d3d26ab28b100e054ea5edfb4fb053f8ed85d | |
parent | db7c229729b196d2d98ba373bf527eb7dc23635d [diff] | |
parent | fd0e9821fb758c476858f0ba890f6f1755505f1a [diff] |
Merge changes If2201f39,Ia1c366c5 am: fd0e9821fb Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1509889 Change-Id: I6ad54ba833d242ed790123c381a308ef678e4d4d