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