| commit | 8fc9b5b68494ac341b882623b1cbe124fd6256f8 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Thu Sep 17 20:40:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 20:40:30 2015 +0000 |
| tree | 008b4a7be83f83a10ae5b69e08cc5ff1f960dd98 | |
| parent | c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec [diff] | |
| parent | 2e006b2b07c7c333c51fb9b447b8df6df66ba421 [diff] |
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 '2e006b2b07c7c333c51fb9b447b8df6df66ba421': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3