tree 257e97db8c4b54d39f89d218b38fb1e245a5c484
parent e2a922ae4c38420406a6ed6350e1bcece73e6f93
author Zach Jang <zachjang@google.com> 1442014504 -0700
committer The Android Automerger <android-build@google.com> 1445452891 -0700

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

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d