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