| commit | 8eda5a7e2d0cc9574d268db9b7989c797020934d | [log] [tgz] |
|---|---|---|
| author | James Mattis <jmattis@google.com> | Sun Feb 14 09:51:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Feb 14 09:51:16 2021 +0000 |
| tree | 6de53c12294a152927344b07791cc9e7d089904b | |
| parent | e39c94644749973264b7afaf595d9e5faf8ceb21 [diff] | |
| parent | 6c16aeadfb8c96b19a9cb065c3c198acef1c4079 [diff] |
Merge changes from topics "pans", "pans-permission" am: 601d16a336 am: d11f866ee6 am: 6c16aeadfb Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I20fdb2f06b473f9f92e62138e72bd30d4384a267