tree bbd6293ff7043e2d1b7b4d0f0cb76d6566700074
parent b491048196b767ba79a21858de0e763b2ca5915c
parent 4bffe7598e2770ebf8265b2e01fa633830c916b1
author Tor Norbye <tnorbye@google.com> 1436201859 +0000
committer android-build-merger <android-build-merger@google.com> 1436201859 +0000

Merge "Support custom lint checks in the IDE" into studio-1.4-dev automerge: b3977a2
automerge: 4bffe75

* commit '4bffe7598e2770ebf8265b2e01fa633830c916b1':
  Support custom lint checks in the IDE