| commit | b0054ec4e2275d8d0444b94c0560374630e077f6 | [log] [tgz] |
|---|---|---|
| author | Victor Chang <vichang@google.com> | Mon May 23 11:51:54 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 23 11:51:54 2016 +0000 |
| tree | 0790cbe856357dc12713bac649f0b94b64877c34 | |
| parent | ffe930ec76e8bf2ca0ffaffffea60b452e1ad88c [diff] | |
| parent | 5e0a46bff6d801a52d9c50d19e25286a2afc8b40 [diff] |
Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev