Commit 18f94b1e authored by Jesse Hall's avatar Jesse Hall
Browse files

resolved conflicts for merge of 51b27e82 to klp-dev-plus-aosp 

File was moved to system/core.git. Change will be applied there.

Change-Id: Ic2027b7f3f1f1fb4b896a219a8c1b4ab545d9723
parents bb3b5249 51b27e82
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment