| commit | 825518b7b996d5d8df84f801b3d1725e786f132f | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 21:37:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:37:14 2015 +0000 |
| tree | ad5c7780118aa0f7617e00ea4e9db3a15203d0b4 | |
| parent | 2d0db3098ebdbe20a0cbe4a8afc7b8e593317d3b [diff] | |
| parent | 2ead093496c3b5b266c21a483c4f0c37869d57de [diff] |
am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '2ead093496c3b5b266c21a483c4f0c37869d57de': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3