tree 7357b11ef5a6bcee3abc9af0821bf9443f1118b9
parent 5017286aa1bac5ca4cd6a48ea8be0fbcc5e1ae92
parent a4107d39ad6a21b4fbba72d0dc2ef2c81cfccbb1
author Shuo Qian <shuoq@google.com> 1537987620 -0700
committer android-build-merger <android-build-merger@google.com> 1537987620 -0700

Merge "Make SubscriptionManager.isActiveSubId public" am: fafc51a088
am: a4107d39ad

Change-Id: Iff157bac8d07cbf686089fbdaf8c58c17d10e527