| commit | 8fef0576518fa9baaf701e1da5564c2f6f2d9645 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:30:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:30:07 2015 +0000 |
| tree | 7501da73d6c325513cf56566749cb0dda39437da | |
| parent | 2ead093496c3b5b266c21a483c4f0c37869d57de [diff] | |
| parent | 7b2994d2e87eafe84425666aba8f818e661a6fac [diff] |
am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '7b2994d2e87eafe84425666aba8f818e661a6fac': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3