| commit | 7b5bf993e4cc9f333a9adb3a00672c668a0f3fdb | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Thu Sep 17 20:32:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 20:32:53 2015 +0000 |
| tree | d516248df4f70b6208cee8ea588df43d2bbbb065 | |
| parent | 1cf21e443aaf207b962f50169be28c0babe71f61 [diff] | |
| parent | fe4cbf2b1b135b327018915a512a8e6293a96017 [diff] |
am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings * commit 'fe4cbf2b1b135b327018915a512a8e6293a96017': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings