tree fa8071070f885f177115aa1efe335fb42e775699
parent 86d853000feca5a627ef87760cdd7df3c3aea1bb
parent 00721b4afa3940138e82cd150bb6670239ec0b5b
author Zach Jang <zachjang@google.com> 1442862336 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442862336 +0000

am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '00721b4afa3940138e82cd150bb6670239ec0b5b':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3