OSDN Git Service

Merge "Annotate Data and Voice Roaming setters with @TestApi." am: e1dda15d6c am...
authorCody Kesting <ckesting@google.com>
Sat, 23 Mar 2019 01:53:41 +0000 (18:53 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 23 Mar 2019 01:53:41 +0000 (18:53 -0700)
commit02f144a8e9b497da5b0452dc6683069586a3f2d4
treec9f677050cd60c0a03473def6bde809449907bb3
parent8918804a2330228d6dab5aec7a6e93b2b949418b
parent66fb2bf986eb06ca577bc6b6cda9485a3b3e7e0a
Merge "Annotate Data and Voice Roaming setters with @TestApi." am: e1dda15d6c am: c028f7a57a
am: 66fb2bf986

Change-Id: Iba01930bc02239e54bd05ef4e98a99cdb74d4be4
api/test-current.txt
telephony/java/android/telephony/ServiceState.java