am d641bb00: am 73ffe0cc: Merge "Catch errors for unknown object types."

* commit 'd641bb009912818a1eb68bb46bfaf3af08318ea7':
  Catch errors for unknown object types.

rs/java/android/renderscript/FileA3D.java

@@ -145,6 +145,9 @@ public class FileA3D extends BaseObj {
             case MESH:
                 entry.mLoadedObj = new Mesh(objectID, rs);
                 break;
+
+            default:
+                throw new RSRuntimeException("Unrecognized object type in file.");
             }
 
             entry.mLoadedObj.updateFromNative();