| commit | cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Mar 20 13:16:32 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 13:16:32 2014 -0700 |
| tree | b0a2c20c639a0095231e6913513a7637e24a6fb9 | |
| parent | 55371beb024ae402831898f8788e4293f52dd832 [diff] | |
| parent | 759445c5bdb2eb54af9e974f604226596976e078 [diff] |
am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev * commit '759445c5bdb2eb54af9e974f604226596976e078': Verify certificates