am 9f141fbb: am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals."

* commit '9f141fbb786c07ff56324717e1e0747a3cabf23b':
  Fix null check for BaseObj.equals.

rs/java/android/renderscript/BaseObj.java

@@ -181,6 +181,10 @@ public class BaseObj {
         if (this == obj)
             return true;
 
+        if (obj == null) {
+            return false;
+        }
+
         if (getClass() != obj.getClass()) {
             return false;
         }