Skip to content
Commit a512adf4 authored by Nazanin Bakhshi's avatar Nazanin Bakhshi Committed by android-build-merger
Browse files

[automerger skipped] Merge "make onActiveDataSubId in PhoneStateListener... 

[automerger skipped] Merge "make onActiveDataSubId in PhoneStateListener public API" am: dfe984c3 am: 558a5e26
am: d7735a13 -s ours
am skip reason: change_id I6e5a5c8273348d822b8f552599784b8e986850bf with SHA1 026c42d7 is in history

Change-Id: I7050435f330e9da4b41b83db2ef0c2dd5257ed86
parents 08c3b442 d7735a13
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment