Skip to content
Commit 2dbc22cb authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

[automerger skipped] Merge "Expose... 

[automerger skipped] Merge "Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API." am: 096cd201 am: dd1f02d0
am: b196b9b7 -s ours
am skip reason: change_id I1cddd570d5c1203ca749be0ac78093df9e97ee3b with SHA1 65f65b2d is in history

Change-Id: Iacaba6224b25006eee4aa28de9e0b00197100732
parents c6274feb b196b9b7
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