tree 389c425359ea2ffeed380588bd4171f390780657
parent 8e5f4987f27f52386a2de158fee0e7cb9fff789b
author Zach Jang <zachjang@google.com> 1442264592 -0700
committer The Android Automerger <android-build@android.com> 1443483123 -0700

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

b/23946860

Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c