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

[automerger skipped] Merge "Merge "Expose... 

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

Change-Id: Id9c9c4d36e7f55f89f06616fc3216c7c93caa261
parents 2dbc22cb feb80c26
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