| commit | ef02406452c41f90955460179c1f1d900bcedba9 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:06:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:06:10 2015 +0000 |
| tree | 25717e681fb0619fe879112463952187667e20f4 | |
| parent | f694d378955ddac3ee2651080bfa00c5ae39dddc [diff] | |
| parent | 0961150929c775a439f31b8c4fb35ba6a03c6f08 [diff] |
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 '0961150929c775a439f31b8c4fb35ba6a03c6f08': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3