| commit | a7168e1c6ef9e9bc5491b09cb9db683b69e25e2b | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Thu Sep 17 20:27:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 20:27:20 2015 +0000 |
| tree | 5fe49cf3f5f82fff2e154ab213e9468de15d2bbf | |
| parent | 47ef4c3467e4f895b776fb0e8dbcba8f90a9398c [diff] | |
| parent | e539537d8c7a4288f40afa9226787b9af3d4416b [diff] |
am e539537d: (-s ours) am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3 * commit 'e539537d8c7a4288f40afa9226787b9af3d4416b': DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3