Merge branch 'master' into per-contact-colors

This commit is contained in:
Moez Bhatti
2015-12-24 18:41:06 -05:00
@@ -113,6 +113,9 @@ public class ImageUtils {
Cursor cursor = context.getContentResolver().query(
photoUri, new String[]{MediaStore.Images.ImageColumns.ORIENTATION}, null, null, null
);
if (cursor == null) {
return 0;
}
if (cursor.moveToFirst()) {
result = cursor.getInt(0);
} else {