commit | 11f0a179d77af153d0dbb1ec82abfd29b7357ae5 | [log] [tgz] |
---|---|---|
author | Orion Hodson <oth@google.com> | Tue Aug 04 14:02:49 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 04 14:02:49 2020 +0000 |
tree | 95cc6f4161ab37b4bef81dc3c82003dd774835dd | |
parent | 4c7276679d0419c8fafdb7c7494c030d6b984427 [diff] | |
parent | 74ad7baf8519512f3fe224dd68ee5dfabf69c8e2 [diff] |
Merge changes from topic "art-owners-update" am: 6066f5dae1 am: 74ad7baf85 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382418 Change-Id: Id5cf529e4f525ee3f4e7779ae155c54741a389c3