| commit | 88f92ec5a76c94dcb084ffcc8a4fc36a66bb9ca2 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:37:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:37:34 2015 +0000 |
| tree | 2673783470845a2f400564180844970abd49350e | |
| parent | c53f18b7b3cea030983e23fbf0d49dfcda77b249 [diff] | |
| parent | fed2854653d7e9d596cf1d9cb9c41ff05e744e94 [diff] |
am fed28546: 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 'fed2854653d7e9d596cf1d9cb9c41ff05e744e94': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings