am df85a4fc
: (-s ours) am f67d0785
: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
* commit 'df85a4fc2194fb95a67e8388479f1b07dba7fa3c':
This commit is contained in: