| commit | 6c16aeadfb8c96b19a9cb065c3c198acef1c4079 | [log] [tgz] |
|---|---|---|
| author | James Mattis <jmattis@google.com> | Sat Feb 13 21:51:49 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 13 21:51:49 2021 +0000 |
| tree | cc09af421a51d56b797307870e9096f2057d4a42 | |
| parent | 5ea7cd28fb8d2072da7134851f7360830f1321c8 [diff] | |
| parent | d11f866ee61033d574dc4e01139a0dc86054896f [diff] |
Merge changes from topics "pans", "pans-permission" am: 601d16a336 am: d11f866ee6 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8afdee99c0b0813d3e3a61df053f9cdef966949c