Commit 48441fde authored by Unsuk Jung's avatar Unsuk Jung
Browse files

resolved conflicts for merge of e5fc06e9 to klp-modular-dev 

Conflicts:
	tests/tests/accessibilityservice/AndroidManifest.xml

Change-Id: Icd9e754a2c79f9436379219736492f5e9cf6c538
parents fb81f541 e5fc06e9
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