| commit | 0acd070f559ba464378c2871733b0ba3a07514f2 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:44:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:44:49 2015 +0000 |
| tree | cc8d775bc4384916dcf094e2a74ee3e1ba1521c5 | |
| parent | 0ac53af01a8c644925f9d30596de7a36ec5ef5b8 [diff] | |
| parent | 61b8955c86a9c949888949be91c06fadf04890cb [diff] |
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 '61b8955c86a9c949888949be91c06fadf04890cb': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3