| commit | 7b2994d2e87eafe84425666aba8f818e661a6fac | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:06:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:06:16 2015 +0000 |
| tree | d0c7a613ef897e9299fdb555265b407e74289c56 | |
| parent | 386c7763eb8cd3e856a26fe3cbd39cc573978c29 [diff] | |
| parent | 1304f47c1b63d1daa001f4d1c209a34f1b3af5d3 [diff] |
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 '1304f47c1b63d1daa001f4d1c209a34f1b3af5d3': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3