tree 92313204f4202874278b22d9a619524d3549009c
parent 420662b9cdacf715de341db01e873b1ddc53f987
parent 25abc5a38e2e7f2962463aa4e5cd407ecdde689c
author Dianne Hackborn <hackbod@google.com> 1439427231 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439427231 +0000

am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev

* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
  Fix issie #23116383: Include security patch level in Settings