| commit | fed2854653d7e9d596cf1d9cb9c41ff05e744e94 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:30:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:30:32 2015 +0000 |
| tree | b794743ce81ef7ff81bd256d03d11db5210af11d | |
| parent | 937141cb75160a1a51b9568481225aec286c5a86 [diff] | |
| parent | 3e344f3fcb66f3e94a3b5436d5901dec0b94cbb3 [diff] |
am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings * commit '3e344f3fcb66f3e94a3b5436d5901dec0b94cbb3': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings