tree f0a854d661167a6058ba3396c3b8a2d5a7401e0e
parent c814f4aa66411ae3c86ffe468787ffabd1d3f5b2
author Zach Jang <zachjang@google.com> 1442017629 -0700
committer The Android Automerger <android-build@android.com> 1443482645 -0700

DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3

b/23946860

Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3