commit | e54c195a53694696e0913722fa721c882e33753e | [log] [tgz] |
---|---|---|
author | Zach Jang <zachjang@google.com> | Mon Sep 21 18:58:18 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 18:58:18 2015 +0000 |
tree | 313b7a1810e1adf514b0b1116d95bedb5c986b61 | |
parent | 683cd049f7c762251567a0e0386ee49bb1428351 [diff] | |
parent | 0a8197b1e43bc3771fc3f8595619603ec8f6f641 [diff] |
am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings * commit '0a8197b1e43bc3771fc3f8595619603ec8f6f641': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings