| commit | 5695a7f6402aef65f5f4a90a2a833446168ea999 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:52:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:52:55 2015 +0000 |
| tree | 709089365028ef2f977fa769b0b672a28b3a7006 | |
| parent | 3a273f457cd045dcd8ea30f75d0704607499d60f [diff] | |
| parent | ef44f99d90e81de4dff92d7cdbdb58e6b38fcbd4 [diff] |
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 'ef44f99d90e81de4dff92d7cdbdb58e6b38fcbd4': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings