diff options
| author | Michael Groover <mpgroover@google.com> | 2021-02-03 00:02:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-02-03 00:02:52 +0000 |
| commit | 540b50bbe7397304436e3bbb63957c0cb265dbce (patch) | |
| tree | 768ec97d6223d082d51ef0e3ac76573ab655dbad /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 260d69a4d504427666cc1ff9f6f41b6904cdef19 (diff) | |
| parent | 5aba70130d3539fc77cfdfb4b550d8e86acd8a60 (diff) | |
Merge changes from topic "173421434-SubInfo-ICCID-qt-dev" into qt-dev
* changes:
Add method to clear out SubscriptionInfo#getCardString
Whitelist READ_PRIVILEGED_PHONE_STATE for the contacts provider
Update the getIccId docs to reflect access requirements
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions