Skip to content
Commit d303f807 authored by Malcolm Chen's avatar Malcolm Chen Committed by android-build-merger
Browse files

Merge "Copy layout file of preference category from Settings." am: 03c6030c -s ours 

am: 176b656f  -s ours

Change-Id: Ib2c4d023f26564833619edf2a4ad8eb28c4a29a6
parents a18f8400 176b656f
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