Commit 47a2f172 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

* commit '3d520a2c':
  Update Android Gradle plugin to v2.1.0

Change-Id: I4910e341d7f094e274f392d1813a47e1cd76f60b
parents bfc05ac9 3d520a2c
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