tree 6ee608df2213f6f5c5a7cb25128a870608b5f32b
parent 52ff7c18102c06b60a2f80de5f92be072f4ec936
parent 870db7fbed553540aacd4e23a4383dd5990045ff
author Tor Norbye <tnorbye@google.com> 1428605015 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428605015 +0000

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

* commit '870db7fbed553540aacd4e23a4383dd5990045ff':
  Update ADT plugin with lint API change