am 1c92675c: Merge "Update ADT plugin with lint API change" into studio-1.3-dev automerge: d21a036 automerge: d26711d

* commit '1c92675c92ed41b9836723d2122802a436e87880':
  Update ADT plugin with lint API change