tree 3854f5afd88560a376011068f043e282e3d1e69a
parent 8089790805c51d77fa875854ae72b6802ba73f44
parent 242b982b71395c0016313bc7f9833c7144819431
author Nazanin Bakhshi <nazaninb@google.com> 1547574513 -0800
committer android-build-merger <android-build-merger@google.com> 1547574513 -0800

Merge "add getPreferredDataSubId to SubscriptionManager and rename setPreferredData -> serPreferredDataSubId" am: 396e01a168
am: 242b982b71

Change-Id: I8f33606dc6a29c833e5405ff6bf8d9b7e3f46815