Commit 72880489 authored by Trevor Johns's avatar Trevor Johns
Browse files

Resolve merge conflicts of d6a72ad7 to nyc-dev 

Conflicts:
	wearable/wear/RuntimePermissionsWear/gradle/wrapper/gradle-wrapper.properties

Change-Id: I80af76fd94a11fc8470d6fc4a6822ad0b455bf4b
parents f60722b1 d6a72ad7
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