Commit 7de4fb16 authored by Trevor Johns's avatar Trevor Johns Committed by android-build-merger
Browse files

Resolve merge conflicts of 110c563c to nyc-dev 

am: b34ce745

* commit 'b34ce745':
  Update master Gradle version to 2.10

Change-Id: I416f3ce7955a6121d3ec396521e1f19e5ec62538
parents 9f4d3cc2 b34ce745
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