| commit | 9ee72b65436242ab4f8f4ceb904ea5078779416c | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Mar 20 10:51:35 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 10:51:35 2014 -0700 |
| tree | 8cf31849d8f736ab8f4840c00fa85657528b951f | |
| parent | 32753f4f1c0dfd810d68759cce3e51cf788084f8 [diff] | |
| parent | 665b07579aa2a74bb5425d543892da40d78b7ef8 [diff] |
am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev * commit '665b07579aa2a74bb5425d543892da40d78b7ef8': Verify certificates