diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-02-05 08:33:35 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-02-05 08:34:30 -0800 |
| commit | a2fd336a4943a02e31bfdb916755fdd14346688f (patch) | |
| tree | 417d1d884713a0d1f329b49fce0f222b35f3ba7e | |
| parent | 4dfa20c931814e6ce05cdeda709507addf93a809 (diff) | |
| parent | 2c9ae928a7f78744fba5e947f6e67593f0b635fb (diff) | |
| download | libconstrainedcrypto-a2fd336a4943a02e31bfdb916755fdd14346688f.tar.gz | |
resolved conflicts for merge of e577a83a to eclair-plus-aosp
0 files changed, 0 insertions, 0 deletions