tree 6ccb49b8644a886f356844440dda2c1d9f594f38
parent 22e66b357450bc89d2e9426eddfd7d8ca9c50bc0
parent 64685ea320f8916087b8fd022ab1ce3028bec62a
author Zach Jang <zachjang@google.com> 1442880283 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442880283 +0000

am 64685ea3: am ef024064: (-s ours) am 09611509: am 63712481: am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

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