Adding static method to ResName to qualify from a file path
Making openNonAsset load real resources instead of returning the name as a byte array
Adding method for an easier way to create bitmap of specified size
Extracting the real size of images in streams
Adding images with different qualifiers
Using qualifiers from asset manager to select correct drawable
Cleaning up what looks like unnecessary usage of string based reflection on AlertController
Storing the iconId when set on AlertController in the shadow
Calling setToDefaults() on the real Configuration, from the shadow, to get sp dimensions to work
Verifying that setTextSize and getTextSize works with sp in TextView
Convert FileFsFile to canonical paths

Fixes multiple inclusions of res/ directories with transitive
libraries.

This also required making ResourcePaths’s equals and hashcode methods
null safe.
Merge pull request #1032 from blurpy/sp-dimension

Adding support for scale-independent pixels in Resources.getDimension()
Merge pull request #1023 from blurpy/drawable-size

Adding support for getting the real height and width of drawables
Merge pull request #1031 from blurpy/dialog-icon

Adding method to get the dialog iconId from ShadowAlertController
Merge pull request #1042 from charlesmunger/makecanonical

Convert FileFsFile to canonical paths
Add Michael to pairs
Set bitmap config when using BitmapFactory.

Fixes #876. Closes #1045.
Allow an options bundle to be used in startActivity.

Prevents an NPE from being called when supplying an options bundle to
context.startActivity(intent, bundle). The bundle isn't passed on, but
instead stored in IntentForResult.

Fixes #1046. Closes #1047.