| commit | 5d05906d56ef9f118a7b6f6979ed4b7b9c31a575 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 22:02:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 22:02:29 2015 +0000 |
| tree | aa59dfe1c6d8fd0e3acc36a8e6ee929ae930e142 | |
| parent | e1964182de52d00950219810798ea4e7900fb57b [diff] | |
| parent | 3a273f457cd045dcd8ea30f75d0704607499d60f [diff] |
am 3a273f45: am 4a9ccd15: am c53f18b7: am 937141cb: 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 '3a273f457cd045dcd8ea30f75d0704607499d60f': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings