| commit | 4a9ccd15bd42cfb600d180ae6b7a5ddbebaffc59 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:45:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:45:05 2015 +0000 |
| tree | 9fa6118f6e3f60ec57f7e78d4de24d744b4d275f | |
| parent | b7b17fa6a14a6916f12568f02360a1ec1792f256 [diff] | |
| parent | c53f18b7b3cea030983e23fbf0d49dfcda77b249 [diff] |
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 'c53f18b7b3cea030983e23fbf0d49dfcda77b249': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings