Skip to content
Commit 4209c4bc authored by Daniel Norman's avatar Daniel Norman Committed by Automerger Merge Worker
Browse files

Merge "Updates noparent to only apply to the per-file files." am: ea8ca4b8... 

Merge "Updates noparent to only apply to the per-file files." am: ea8ca4b8 am: 96acd833 am: f15eb86b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d16d3b3d878c698bd0fc650bc25dc50c41e5bbc
parents 137003fd f15eb86b
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