summaryrefslogtreecommitdiff
path: root/libmincrypt
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-01-28 07:38:15 -0800
committerJean-Baptiste Queru <jbq@google.com>2010-01-28 07:38:15 -0800
commit2f3d96ee5b6ba43b49d0e08c75b9a74b05f37b8b (patch)
tree32e34028199dfbc6b260e2204601452f209f8da1 /libmincrypt
parent9aa6b0453321cc542d3b0eefd6563b4614292f4d (diff)
parent20f410a41890113de126680518c13cdab359c66d (diff)
resolved conflicts for merge of 20f410a4 to master
Change-Id: I187f29848c223c8c548323e0fa20ea0f3b8a3909
Diffstat (limited to 'libmincrypt')
0 files changed, 0 insertions, 0 deletions