| commit | 00108830be3293244b3f5e53bb2a681980ba58e5 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:52:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:52:33 2015 +0000 |
| tree | 0b8e7139e0cb5eaf5b6dcc2493aebea2a17b494b | |
| parent | 4925e6234f522ee7d3c2b20ed9617df0759c0ae0 [diff] | |
| parent | 0acd070f559ba464378c2871733b0ba3a07514f2 [diff] |
am 0acd070f: am 61b8955c: 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 '0acd070f559ba464378c2871733b0ba3a07514f2': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3