| commit | 64685ea320f8916087b8fd022ab1ce3028bec62a | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 23:57:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 23:57:06 2015 +0000 |
| tree | 3110964e1210105dfb31b836787060a9d2843a48 | |
| parent | a5842d3e17f2d619f5de7bfae85f58ff9642dae4 [diff] | |
| parent | ef02406452c41f90955460179c1f1d900bcedba9 [diff] |
am ef024064: (-s ours) am 09611509: am 63712481: am bb97ff59: am a7168e1c: am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3 * commit 'ef02406452c41f90955460179c1f1d900bcedba9': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3