tree 861647ffe903e793f7f33a78743b8699a61e0bd2
parent 2bc550372e915099959b142ca0419f4bbf7b6389
parent 3584337613fa087e743783e30856cd0aeb5c218d
author Android Build Merger (Role) <android-build-merger@google.com> 1492800426 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1492800432 +0000

Merge "Merge "Use SubscriptionId instead of SubId" am: 946410eef5 am: 9cad054e02 am: fb0acf3355" into oc-dev-plus-aosp