Commit 3d520a2c 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

* commit '462f3ed4':
  Update Android Gradle plugin to v2.1.0

Change-Id: If515583d74bd12ae234bee7883e80e6dbdac078d
parents c2aecd24 462f3ed4
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