am df9c8e86: am 870db7fb: am 1c92675c: Merge "Update ADT plugin with lint API change" into studio-1.3-dev automerge: d21a0361 automerge: d26711d0 * commit 'df9c8e86': Update ADT plugin with lint API change