tree a891a53d9b5eb6f40958aa26e90b468363ecf471
parent 8c2ee34cadce04ca9cd36640038945d82223dacb
parent da0eb19f507d0f6ef2b2366e213b89358c7738ff
author Jordan Liu <jminjie@google.com> 1492798986 +0000
committer android-build-merger <android-build-merger@google.com> 1492798986 +0000

Merge "Use SubscriptionId instead of SubId"
am: da0eb19f50

Change-Id: I089dd5db7281faaa2af5362ab4a94b5c05ffa367