diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-10 10:17:13 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2014-10-10 10:17:13 +0100 |
| commit | 2164d895f9ae077ce2d53ccdcc213c3483f3b9bd (patch) | |
| tree | d3bf3e237b5d652f6c62a6a891f2921be2857b20 /CaCerts.mk | |
| parent | d6aa6177c90a84620e79b65009129c985b1913d4 (diff) | |
| parent | 865c83f8383f03d545217c35d9140a4627a74406 (diff) | |
| download | libcore-2164d895f9ae077ce2d53ccdcc213c3483f3b9bd.zip libcore-2164d895f9ae077ce2d53ccdcc213c3483f3b9bd.tar.gz libcore-2164d895f9ae077ce2d53ccdcc213c3483f3b9bd.tar.bz2 | |
resolved conflicts for merge of 865c83f8 to jb-mr2-dev-plus-aosp
Change-Id: I552e60c4cc00bf422aad5ba3939ed50eaef11e56
Diffstat (limited to 'CaCerts.mk')
0 files changed, 0 insertions, 0 deletions