tree 8e3111515420e348c930d32145d87d5768901802
parent 27369f992828b01143a3d5e8454b823a68b63972
parent 558a5e26326f23c2f746e8ce7c2c57058e6fea2a
author Nazanin Bakhshi <nazaninb@google.com> 1552084874 -0800
committer android-build-merger <android-build-merger@google.com> 1552084874 -0800

Merge "make onActiveDataSubId in PhoneStateListener public API" am: dfe984c3fe
am: 558a5e2632

Change-Id: Iecac7b32f88a2b4d8d3236b2e571dde832b49044