tree e06f97fa41de1d84bff398ea840168accd5d171c
parent 5f48454d6e98d147959f1a7b71e97414444dac1c
author Zach Jang <zachjang@google.com> 1442017629 -0700
committer The Android Automerger <android-build@google.com> 1445452811 -0700

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

b/23946860

Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3