Commit 6d8ccb5c 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: I2a1673b705f6ed1fb7a07db97a76b26c40d4af8c
parents c9f42c63 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