[automerger skipped] Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236 am: e73b25e37b am: 42710f069d am: 07536baadf -s ours am: 8b498d237b -s ours

Browse Source

am skip reason: Change-Id I61e59f7ba9d6c64019d620d6cb80099ded41473f with SHA-1 a12327b5f3 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425489

Change-Id: If8a740ff1190738501a6cfccf307edb19952d4b1

...

This commit is contained in:

Bonian Chen

2020-09-11 23:48:45 +00:00

committed by Automerger Merge Worker

parent 0a3a51bdea 8b498d237b

commit 4774e8107a

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