tree 6ee608df2213f6f5c5a7cb25128a870608b5f32b
parent c97bf6882b8e5378b9edbeaa49dc81a9f76b1788
parent df9c8e86eaa4ecc8793a8a25c82ed962bd27c16d
author Tor Norbye <tnorbye@google.com> 1428606382 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428606382 +0000

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

* commit 'df9c8e86eaa4ecc8793a8a25c82ed962bd27c16d':
  Update ADT plugin with lint API change