tree 9a457f1a5548a7611968a294ab54fa27de0ca4cf
parent cd8f838d079b38d8c125396f7932c4be24063193
parent 59a7652985c6e49478348c6643b491275f1dc8f3
author Dianne Hackborn <hackbod@google.com> 1439428687 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439428687 +0000

am 59a76529: am 6ff3e53f: am 897f3ba8: am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev

* commit '59a7652985c6e49478348c6643b491275f1dc8f3':
  Fix issie #23116383: Include security patch level in Settings