tree 96605067d05694d3fea726e21c3f08cf697f3c55
parent d105b2510bd6a51cf555ac6d77ad30fe2351950a
parent 593739acd117f723bdaa7cac51df923259d3c597
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1547575314 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1547575314 +0000

Merge "[automerger skipped] Merge "add getPreferredDataSubId to SubscriptionManager and rename setPreferredData -> serPreferredDataSubId" am: 396e01a168 am: 242b982b71 am: 9439803c8c -s ours am skip reason: change_id I67b18f1ef450c3d9e5615b3d2ec8a53a0691d7af with SHA1 6ca46074e1 is in history"