tree e76bfdc5a7612a1f7c21a54e5394c8aa5613185a
parent c803bae45c10c95a98792a328215b6954f390dc1
parent 8539d6ae4cfcfa88fd3bffc0a235d86baed2136c
author Lingfeng Yang <lfy@google.com> 1533751777 -0700
committer android-build-merger <android-build-merger@google.com> 1533751777 -0700

Merge "Put back gradle 2.2" am: 1ec64f4d17
am: 8539d6ae4c

Change-Id: If9f9adf9025d8be77cf09641acbf2d1ddc65518e