Merge 802dfd96df7768176e23c09a1180316669ac906b into…

Authored by brianbeckerg <brianbecker@google.com> on Jul 6 2017, 5:32 PM.
This commit has been deleted in the repository: it is no longer reachable from any branch, tag, or ref.
GitHub <noreply@github.com> committed rNIMBUS09eaf97efe05: Merge 802dfd96df7768176e23c09a1180316669ac906b into… (authored by brianbeckerg <brianbecker@google.com>).Jul 6 2017, 5:32 PM

Merged Changes

CommitAuthorDetailsCommitted
802dfd96df77Brian Becker
Use the correct type when getting NSUnderlineStyle from CFNumber 
Jul 6