| commit | 8a858284242d428e9db69d337a717a48edc88714 | [log] [tgz] |
|---|---|---|
| author | Victor Chang <vichang@google.com> | Tue May 24 14:20:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 24 14:20:01 2016 +0000 |
| tree | 4267ab064567fdd0829daa1753568448da72b4b5 | |
| parent | e6e8c92134b7a212058d7728007407eb74720625 [diff] | |
| parent | 32e17d08629e745cb21ba381f752ec84d2ed591e [diff] |
Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862 * commit '32e17d08629e745cb21ba381f752ec84d2ed591e': Trust the certificate after unlocking screenlock Change-Id: Ib9e51ab5dac5d0f9a7e938a056cd99a0af4c22de