tree 7a40f3fddb58be1e8057ead0730a7c71e7ae2cf4
parent 846b2d1920a056abae6381615a487bbe5accc876
parent 247f18f47aca15efbb12fa30a9295299606e6402
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1539111265 -0700
committer android-build-merger <android-build-merger@google.com> 1539111265 -0700

Merge "More descriptions on SubscriptionController#setPreferredData" am: 16fcd3dcff
am: 247f18f47a

Change-Id: Id25f73dc5a0bd91c78f3822d31a6b37f7b488d5c