Commit 234365a6 authored by Trevor Johns's avatar Trevor Johns Committed by android-build-merger
Browse files

Resolve merge conflicts of 9df2f397 to nyc-dev am: 462f3ed4 am: 3d520a2c 

am: 47a2f172

* commit '47a2f172':
  Update Android Gradle plugin to v2.1.0

Change-Id: I5b6c45294a5e4be89baad6d25268f6ab7af0a0a3
parents 539d36b7 47a2f172
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