[automerger skipped] Merge "Merge "Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API." am: 096cd20182 am: dd1f02d02e" into qt-qpr1-dev-plus-aosp

Browse Source

am: feb80c2665 -s ours
am skip reason: change_id I1cddd570d5c1203ca749be0ac78093df9e97ee3b with SHA1 65f65b2d6d is in history

Change-Id: Id9c9c4d36e7f55f89f06616fc3216c7c93caa261

...

This commit is contained in:

Hall Liu

2019-11-12 15:25:47 -08:00

committed by android-build-merger

parent 2dbc22cb28 feb80c2665

commit cf6db59102

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available