diff options
| author | Elliott Hughes <enh@google.com> | 2012-08-28 19:15:17 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-08-28 19:15:17 -0700 |
| commit | c36d51c8d40b27d79dfbd50283537fa8ad6adec7 (patch) | |
| tree | 2008ee3ebfa6e608383ba7ca15f580424569a7a8 /files | |
| parent | b01d505824d20ddee5350ee5372b7b436416ce15 (diff) | |
| parent | 51c01b7be45748691ea7cf5813d629634bad9b32 (diff) | |
| download | ca-certificates-c36d51c8d40b27d79dfbd50283537fa8ad6adec7.tar.gz | |
resolved conflicts for merge of afbed325 to jb-mr1-dev
Change-Id: Ibd276036f1e153598a79ac877a37298f53f6176f
Diffstat (limited to 'files')
0 files changed, 0 insertions, 0 deletions