tree 52fa30545b9bcc176c565c8a8011ea74bbe09646
parent 145f4ff46a9d8d34ee9a74ec078822520dda8649
parent fdcbe306f13c41b183689a5410dc7ba859ff1a07
author Sunny Goyal <sunnygoyal@google.com> 1460161021 +0000
committer android-build-merger <android-build-merger@google.com> 1460161021 +0000

Merge "Fixing gradle version comflicts" into ub-launcher3-calgary
am: fdcbe30

* commit 'fdcbe306f13c41b183689a5410dc7ba859ff1a07':
  Fixing gradle version comflicts

Change-Id: I64efc68c3c368fd24da5ffb69dd15eb1742a3fc3