tree 4330ac9b708095f734261402ef3f2f8488ff734d
parent 8f6fc08880e4ef7b67ff8216cc5da318b63fc178
parent beb4f02e8db0e021f2b7c7e73df59c18c860133c
author Xavier Ducrohet <xav@google.com> 1462378335 +0000
committer android-build-merger <android-build-merger@google.com> 1462378335 +0000

Merge "Merge "Move build to plugin 2.2.0-alpha1" into nyc-dev am: 01ad7edaae am: 57ac96d05a" into nyc-mr1-dev-plus-aosp
am: beb4f02e8d

* commit 'beb4f02e8db0e021f2b7c7e73df59c18c860133c':

Change-Id: I6330552dfd2250a05177f5ecf739b49f7588c2aa