| commit | cb42de5936acf341c3c8746235394acf53d93aa0 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 22:09:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 22:09:47 2015 +0000 |
| tree | e0080bed3104e0167c1235b9e253d616ebc88928 | |
| parent | c087ee3ec01970e7cf057dc913e6437a2983a0a7 [diff] | |
| parent | 01ce078379715047b767c11a8181599c85a58c74 [diff] |
am 01ce0783: (-s ours) am 5695a7f6: am ef44f99d: am 88f92ec5: 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 Setting * commit '01ce078379715047b767c11a8181599c85a58c74': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings