| commit | ba80596bc0d51b3ddf14c1612c341992bc3ac5fc | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 19:10:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 19:10:51 2015 +0000 |
| tree | c268f4675aa860868c2df33a1d6834919614d143 | |
| parent | b5173241d160a5b6f4d440a01c9a9b0281ee4e66 [diff] | |
| parent | f8cda08986a5caa14daace69e24c82224ac5a9fc [diff] |
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 'f8cda08986a5caa14daace69e24c82224ac5a9fc': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings