tree 83cbccda53e4cf7b6110aae874d9a2de0505c81d
parent 469705cca4939f024808eeb4316cdb134e6d6c2c
parent 6d46d98598c41f3c4875df23843a830559db343d
author sqian <shuoq@google.com> 1540420124 -0700
committer android-build-merger <android-build-merger@google.com> 1540420124 -0700

Merge "Add @Nullable for getSubscriptionIds" am: ceceb459e0
am: 6d46d98598

Change-Id: Ifed7dac40564cd322ea75c14db6b9e1827794507