tree d232cd6546825b3d320988a1f88f2b63a8d9b38f
parent 0fd879cd65f1c53c409142ca90744b1d43bdbc08
parent 25abc5a38e2e7f2962463aa4e5cd407ecdde689c
author Dianne Hackborn <hackbod@google.com> 1439427270 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439427270 +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