| commit | 01ce078379715047b767c11a8181599c85a58c74 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 22:02:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 22:02:36 2015 +0000 |
| tree | aa59dfe1c6d8fd0e3acc36a8e6ee929ae930e142 | |
| parent | 5d05906d56ef9f118a7b6f6979ed4b7b9c31a575 [diff] | |
| parent | 5695a7f6402aef65f5f4a90a2a833446168ea999 [diff] |
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 Settings * commit '5695a7f6402aef65f5f4a90a2a833446168ea999': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings