Skip to content
Commit 6c16aead authored by James Mattis's avatar James Mattis Committed by Automerger Merge Worker
Browse files

Merge changes from topics "pans", "pans-permission" am: 601d16a3 am: d11f866e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8afdee99c0b0813d3e3a61df053f9cdef966949c
parents 5ea7cd28 d11f866e
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment