Commit 3942c383 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 

automerge: 02e41ab5

* commit '02e41ab5':
  Update adt plugin's manifest to use lombok 0.2.3
  Remove obsolete p2gen folder
parents da679312 02e41ab5
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