Merge "Annotation-driven content resolver and intent permission checks" into studio-1.4-dev automerge: b9b58db
automerge: a59bf59

* commit 'a59bf59fd1f337d72b38ecf147d2cd512790bfd5':
  Annotation-driven content resolver and intent permission checks
diff --git a/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java b/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
index dd3e739..fabb9cc 100644
--- a/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
+++ b/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
@@ -528,4 +528,4 @@
       return myFixes;
     }
   }
-}
+}
\ No newline at end of file