Merge "Allow AlertDialog to be used in a DialogFragment" into nyc-dev