am 1b33e6b5: am df85a4fc: (-s ours) am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit '1b33e6b5d064585c03f9a78359f369c25c2acb47':
This commit is contained in:
Dianne Hackborn
2015-08-27 20:21:37 +00:00
committed by Android Git Automerger

Diff Content Not Available