Tyler Gunn 2b396f4f90 resolve merge conflicts of 1d0d34348c to qt-r1-dev-plus-aos am: 1c9d219e15 ...

am: 1ec38f85cf

Change-Id: I1c133f674d3c701e6431ceb666ab65829ab6e572

2019-08-01 10:19:58 -07:00

..

provider

Add @NonNull annotation to CONTENT_URI

2019-07-12 10:10:03 -07:00

telephony

resolve merge conflicts of 1d0d34348c to qt-r1-dev-plus-aos am: 1c9d219e15

2019-08-01 10:19:58 -07:00