tree 000f82f1de02b4f3ace468c87c396881d5c16bc1
parent 6868ef1562d88edbe141bc10b77d7749a94d2222
author Zach Jang <zachjang@google.com> 1442014504 -0700
committer The Android Automerger <android-build@android.com> 1443483016 -0700

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

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d