tree 00be31b04df4a27e67261a359e40929087a0fe5f
parent fa70c8319918c622e1e3098d73679f98dafd3d9a
parent 8dba49402d81e6884bc32f353a07900faddda235
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1540528238 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1540528238 +0000

Merge "[automerger skipped] Merge "Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM." am: 6f7d3848c5 am: 6e4f0f3ee6 am: 12b9f89abf  -s ours"