[automerger skipped] Merge "Expose ApnSetting#TYPE_*_STRING constants" am: bff8389872 am: 04e788bebd am: e364276b90 -s ours

Browse Source

am skip reason: Change-Id I8095ebc4f766be52042eec1c8ee043bf2e2dabfb with SHA-1 d6c3f66329 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1610923

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib841f31fc1c0a0113db068a9cd71621b274c4cda

...

This commit is contained in:

Hall Liu

2021-03-03 00:22:29 +00:00

committed by Automerger Merge Worker

parent 54d4ac8d8a e364276b90

commit b19952ce3d

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