tree e76bfdc5a7612a1f7c21a54e5394c8aa5613185a
parent e5b90c8678d2eb299dce34b6664390f3b9bfb551
parent 702011d2d48638b54fa1a48af7b6860d6b4bbe58
author Lingfeng Yang <lfy@google.com> 1533796567 -0700
committer android-build-merger <android-build-merger@google.com> 1533796567 -0700

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

Change-Id: I70bed63ae63a8b76ae73358773cbf615c838c2ae