Commit 14d533d9 authored by Alex Klyubin's avatar Alex Klyubin
Browse files

resolved conflicts for merge of 2b9e27ee to master 

Conflicts:
	tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java

Change-Id: I44bb4b59ffe1b85dab22609d45179fa06f257adc
parents 5f703fb3 2b9e27ee
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