summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2011-09-15 11:14:58 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2011-09-15 11:14:58 -0700
commitf3c65811c4f6d3490495ae756b60e8c3260dad75 (patch)
tree610ff3dccba0d220965b8068d53895fa0be92dc7
parent2f293c70027e66619bbc6081889029427421b18a (diff)
parentd531c36700816fce5603b8612c4025190324c5ff (diff)
parentf9c00ef178677ab6923ef53eaf6fb6d4bc5a1ee9 (diff)
downloadexternal_libnfc-nxp-f3c65811c4f6d3490495ae756b60e8c3260dad75.zip
external_libnfc-nxp-f3c65811c4f6d3490495ae756b60e8c3260dad75.tar.gz
external_libnfc-nxp-f3c65811c4f6d3490495ae756b60e8c3260dad75.tar.bz2
Reconcile with gingerbread-release gingerbread-mr4-release
Change-Id: Ibcd6e2299e3f03df1a5320041404a42a20546a57