tree ed1b05c1b74f6da21aa464d027958d46bbb6be46
parent 5feacb9e8900acd654445a4552c4d120bd204837
parent 06f2e8490593858f75af8b1993bf6c1f106c8bc1
author Siva Velusamy <vsiva@google.com> 1421257349 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1421257349 +0000

Merge changes I87b5b309,Id23d941c into studio-1.1-dev

* changes:
  Update adt plugin's manifest to use lombok 0.2.3
  Remove obsolete p2gen folder