tree dd6c46a8226b66ddea114e22b1cd0f72eaf48b1c
parent d5b7db316f720fb5b4d8d7542f5935230711825e
parent 5205ae6c3e97d67d1caadf7d6b08f6b3653f2e13
author Jordan Liu <jminjie@google.com> 1492800268 +0000
committer android-build-merger <android-build-merger@google.com> 1492800268 +0000

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

Change-Id: I78cad6838aa80710f84c18342717366cdcdde849