tree a7029dcc813c3244b557f6939c86710b54a8ce6b
parent 9d6cb206469e3c4588c77deaa78bf7a6b6224e42
parent fb0acf335536054a1660e2a72d877a19b8d75f35
author Jordan Liu <jminjie@google.com> 1492800336 +0000
committer android-build-merger <android-build-merger@google.com> 1492800336 +0000

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

Change-Id: I81365ed8a767f4571a62da0ff0ba170badcce462