tree 81c62b27d074a70aae1aabb88185eac1a53fbebe
parent 2d124d3fd28bd59ee0f10628e7a8538b0265e8b2
author Zach Jang <zachjang@google.com> 1442264592 -0700
committer The Android Automerger <android-build@google.com> 1445452965 -0700

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

b/23946860

Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c