commit | d4e61ada2780eed1c6e922aac8f0dc4b2b4bcc9d | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Mon Nov 30 15:18:19 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 30 15:18:19 2020 +0000 |
tree | a12514d9b8b081a0fed8ffef647e53f35d9c211c | |
parent | bb1d23d0713b57e102a71680c57722df74d7cb56 [diff] | |
parent | d650ae9f8e475f1f98faf90ae6b196f13db3e9d6 [diff] |
Merge changes If2201f39,Ia1c366c5 am: 6ec2a15480 am: d650ae9f8e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1509889 Change-Id: I22a75b31abf5f0adfe2835f9da66344aa73a3a22