tree e76bfdc5a7612a1f7c21a54e5394c8aa5613185a
parent dcad1bb64d56a6804d701dcdd7b912cda7194088
parent 9420e5bc14da9a9377da5f314c1b6d57ae301f06
author Lingfeng Yang <lfy@google.com> 1533752566 -0700
committer android-build-merger <android-build-merger@google.com> 1533752566 -0700

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

Change-Id: I3ad0a6b82f500c244e9be9241fa10a16f6226b73