Skip to content
Commit 7034d646 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Backport multi user trace changes." am: 3bf3a055 -s ours 

am skip reason: Merged-In I1661558dced6cb326ce11c94672b60f0352eab3c with SHA-1 7d84ba8c is already in history

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

Change-Id: I95a5c891b6cf6d14f96d803dfd8db6ebe851879c
parents b700fc5e 3bf3a055
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