summaryrefslogtreecommitdiff
path: root/OWNERS.android
AgeCommit message (Expand)Author
2020-05-18Merge 'aosp/upstream-master' into 'aosp/master'Jason Macnak