tree d37b5fb70613be6b1978363a13db109ea97bcc6b
parent 96b140489c129c3085cc866c830b91c1adb0c86e
parent 9cad054e02cb5c36da968e0fedf2159c66636a50
author Jordan Liu <jminjie@google.com> 1492799429 +0000
committer android-build-merger <android-build-merger@google.com> 1492799429 +0000

Merge "Use SubscriptionId instead of SubId" am: 946410eef5
am: 9cad054e02

Change-Id: Ib57abfadda3521667ce788e37e77496300feef4e