| commit | 0961150929c775a439f31b8c4fb35ba6a03c6f08 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 19:05:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 19:05:35 2015 +0000 |
| tree | 885ba5cf76fb3ed126483f67ee3f957a0ce5f702 | |
| parent | b161297d4be7de24f832a4aa7329a7278a41bec5 [diff] | |
| parent | 63712481f04b6525288b5df182d6f3e853a3bfb9 [diff] |
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 '63712481f04b6525288b5df182d6f3e853a3bfb9': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3