| commit | c087ee3ec01970e7cf057dc913e6437a2983a0a7 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 22:09:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 22:09:39 2015 +0000 |
| tree | e0080bed3104e0167c1235b9e253d616ebc88928 | |
| parent | 6e533d5379434a14257a84e1f9d896cd31914a5f [diff] | |
| parent | 5d05906d56ef9f118a7b6f6979ed4b7b9c31a575 [diff] |
am 5d05906d: (-s ours) 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 '5d05906d56ef9f118a7b6f6979ed4b7b9c31a575': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings