diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-07-12 01:17:30 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2011-07-12 01:17:30 +0200 |
| commit | 0ca6912acf53a4081b9312d3b628a87f81dadc52 (patch) | |
| tree | 8c64b09a7568ff5846b3000668c71b8774ffa0d1 | |
| parent | f16124343b080a2f188350de5d5006d14a6eb1bb (diff) | |
| parent | a0cd2ea15e2c664f523303703dd5aafc9351e833 (diff) | |
| download | external_libnfc-nxp-0ca6912acf53a4081b9312d3b628a87f81dadc52.zip external_libnfc-nxp-0ca6912acf53a4081b9312d3b628a87f81dadc52.tar.gz external_libnfc-nxp-0ca6912acf53a4081b9312d3b628a87f81dadc52.tar.bz2 | |
resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aosp
Change-Id: I1ddde3dc5c8f78a99b7181be9146b2097c7d10ed
0 files changed, 0 insertions, 0 deletions