tree e9783a42fef839c7a2cc686dd324740c61eb32b0
parent b52abc91c43051d130eee981fa38b13c1ce0bd96
parent 5ba9df215298485099606592bba12a967f4fb930
author Xavier Ducrohet <xav@google.com> 1462377735 +0000
committer android-build-merger <android-build-merger@google.com> 1462377735 +0000

Merge "Move build to plugin 2.2.0-alpha1" into nyc-dev am: 01ad7edaae
am: 5ba9df2152

* commit '5ba9df215298485099606592bba12a967f4fb930':
  Move build to plugin 2.2.0-alpha1

Change-Id: I2f9ba121c7c0dba574377985495b330ab066b32a