tree eee1344434e0f6453f39fd7d2422fbba90d71138
parent d913d78a331de5e488b27810d8dd18399f50de48
parent 9512a857454d761b53f46958733ba23216c41e64
author Dianne Hackborn <hackbod@google.com> 1439427746 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439427746 +0000

am 9512a857: am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit '9512a857454d761b53f46958733ba23216c41e64':
  Fix issue #23116383: Include security patch level in Settings