Calvin Pan 2f0ad7bfd6 Merge "Marked nullable in setter argument" ...

am: f5bc344375

Change-Id: I6eb379b487e85e4523227938a1f1c281b6b1a8ce

2019-03-24 19:17:45 -07:00

..

android

Merge "Marked nullable in setter argument"

2019-03-24 19:17:45 -07:00

com/android

Merge "Query isEmergencySmsMode API when checking if emergency for GPS"

2019-03-22 10:36:07 -07:00