tree f10e35a1cb50bf41e1df54a00accff0f6e10de63
parent c0a4704f79728a9ae2832b9422a64467b035ee74
author Zach Jang <zachjang@google.com> 1442014504 -0700
committer The Android Automerger <android-build@google.com> 1445454089 -0700

DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d