| commit | 63712481f04b6525288b5df182d6f3e853a3bfb9 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 18:58:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 18:58:22 2015 +0000 |
| tree | 617e87b8c372663f5975cc41f3d8f164d5e214c9 | |
| parent | ab095b445af361911df2856e77f43c4cf103a0e2 [diff] | |
| parent | bb97ff5941b266639e31fd4a30a6d34921e7bc2b [diff] |
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 'bb97ff5941b266639e31fd4a30a6d34921e7bc2b': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3