| commit | f8cda08986a5caa14daace69e24c82224ac5a9fc | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 18:58:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 18:58:27 2015 +0000 |
| tree | 313b7a1810e1adf514b0b1116d95bedb5c986b61 | |
| parent | e54c195a53694696e0913722fa721c882e33753e [diff] | |
| parent | b2b3cecbd3de80d40f8c207c6aa94532c3426829 [diff] |
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 'b2b3cecbd3de80d40f8c207c6aa94532c3426829': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings