| commit | 700e96935929d6a54129872c721fd58f8380df27 | [log] [tgz] |
|---|---|---|
| author | James Mattis <jmattis@google.com> | Sat Feb 13 21:14:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 13 21:14:48 2021 +0000 |
| tree | 31df2221f28f9051f7e9ba4e92f63ed9ba5143c7 | |
| parent | d6cceec670ec735daf3fde4ba5426614501b1bdc [diff] | |
| parent | 6e2d702d373b25603b85436e66b06315e5f12cbf [diff] |
Merge changes from topics "pans", "pans-permission" am: 601d16a336 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I72035b6d5d6504cece1df472ae317e865ceb7882