| commit | 2e006b2b07c7c333c51fb9b447b8df6df66ba421 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Thu Sep 17 20:27:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 20:27:21 2015 +0000 |
| tree | 50acd0d667b8f2a44f0a442c2260c3aa2915bd36 | |
| parent | 6ceb2ba9b8928b33c30e0c639539c3fe2f27971e [diff] | |
| parent | b7e865ee486ea255e0f76c4d0129d608a7e7995d [diff] |
am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit 'b7e865ee486ea255e0f76c4d0129d608a7e7995d': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3