| commit | 53c30d2fd188be1e9c009d7e02e1e944e665b035 | [log] [tgz] |
|---|---|---|
| author | Victor Chang <vichang@google.com> | Tue May 24 14:43:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 24 14:43:47 2016 +0000 |
| tree | 57832f17d47cf9bf4d8cc2a9e2f71b24be519ffb | |
| parent | dd467e01c2546a433d3d1271140f9cc6685143c6 [diff] | |
| parent | f1cbf0a3f267bf61ce15cd3272db987ff01e71ac [diff] |
Merge "Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862 am: 8a85828424" into nyc-mr1-dev-plus-aosp am: f1cbf0a3f2 * commit 'f1cbf0a3f267bf61ce15cd3272db987ff01e71ac': Change-Id: I94f2784ab4ce93a01f9a16ed9873cb6974f6ffac