| commit | bb97ff5941b266639e31fd4a30a6d34921e7bc2b | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Thu Sep 17 20:40:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 20:40:28 2015 +0000 |
| tree | 7e7db26536272a1544125e1b30ff8fb2bb5876ea | |
| parent | 48e2b43e8cc030456b0f625f321c45d2e1775130 [diff] | |
| parent | a7168e1c6ef9e9bc5491b09cb9db683b69e25e2b [diff] |
am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3 * commit 'a7168e1c6ef9e9bc5491b09cb9db683b69e25e2b': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3