| commit | 937141cb75160a1a51b9568481225aec286c5a86 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:30:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:30:27 2015 +0000 |
| tree | b794743ce81ef7ff81bd256d03d11db5210af11d | |
| parent | e1a6299b994bbdb304550e00d5b3b26a064bdf0c [diff] | |
| parent | 0cae8381666248e44875756e72998e55ed3f9151 [diff] |
am 0cae8381: (-s ours) am b5173241: am e54c195a: am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings * commit '0cae8381666248e44875756e72998e55ed3f9151': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings