| commit | 61b8955c86a9c949888949be91c06fadf04890cb | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:37:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:37:15 2015 +0000 |
| tree | ad5c7780118aa0f7617e00ea4e9db3a15203d0b4 | |
| parent | 825518b7b996d5d8df84f801b3d1725e786f132f [diff] | |
| parent | 8fef0576518fa9baaf701e1da5564c2f6f2d9645 [diff] |
am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '8fef0576518fa9baaf701e1da5564c2f6f2d9645': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3