tree ad4e4648a86fda2a4ac735a258f4fb8ccc2185da
parent d311d05b113b4e258a01c77813faf3b8f4102573
parent cb9b60e3e16cd7bf94f24b8c0ac3e82e02374a53
author Jordan Liu <jminjie@google.com> 1492799437 +0000
committer android-build-merger <android-build-merger@google.com> 1492799437 +0000

Merge "Use SubscriptionId instead of SubId" am: da0eb19f50
am: cb9b60e3e1

Change-Id: I12cd90f6549bf2b0bce57a45d2de818524c646a4