Commit 02e41ab5 authored by Siva Velusamy's avatar Siva Velusamy Committed by android-build-merger
Browse files

Merge changes I87b5b309,Id23d941c into studio-1.1-dev 

automerge: 92eb4b16

* commit '92eb4b16':
  Update adt plugin's manifest to use lombok 0.2.3
  Remove obsolete p2gen folder
parents 1bebb7d4 92eb4b16
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment