| commit | f1cbf0a3f267bf61ce15cd3272db987ff01e71ac | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 24 14:24:21 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 24 14:24:22 2016 +0000 |
| tree | 9765f121c0fd9a06ec2846dd464875d609f20bb5 | |
| parent | 19a110708959b7b35e0d182e543f81e495de140b [diff] | |
| parent | 0c9117a5461d770ad2c567c72b58864d525d2626 [diff] |
Merge "Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862 am: 8a85828424" into nyc-mr1-dev-plus-aosp