tree 4badd17aaca62b633699086348d38085add98e53
parent a77d33f151746c56e251204de966c1a8b80bec16
parent b3b43923bd4340108b5f166ebc5dd6ff3380cfae
author Sunny Goyal <sunnygoyal@google.com> 1480464098 +0000
committer android-build-merger <android-build-merger@google.com> 1480464098 +0000

Fixing gradle version conflicts
am: b3b43923bd

Change-Id: Ia670b07a33c26f83bdd470e29d8b47a8b7ffaf39