| commit | 5cac896612ead73d08acb588e2f62512f8789cf4 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 18:58:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 18:58:23 2015 +0000 |
| tree | 761933ee76b46f111cc7aca497ce3be55dd21450 | |
| parent | 00721b4afa3940138e82cd150bb6670239ec0b5b [diff] | |
| parent | 8fc9b5b68494ac341b882623b1cbe124fd6256f8 [diff] |
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 '8fc9b5b68494ac341b882623b1cbe124fd6256f8': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3