tree 7e7db26536272a1544125e1b30ff8fb2bb5876ea
parent 1bd155692f2e7ddc4fb6b874fc586ba8ab86a363
parent 47ef4c3467e4f895b776fb0e8dbcba8f90a9398c
author Zach Jang <zachjang@google.com> 1442520257 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442520257 +0000

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

* commit '47ef4c3467e4f895b776fb0e8dbcba8f90a9398c':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3