summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-05-18 18:44:01 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-05-18 18:44:01 -0700
commit67038a303747888714067d18745573b61206eb1d (patch)
tree41ab057f2d788b41215d1deb9f2b75b23b9059c5
parentbeb7b1b4b95b1762b507eb2a9c6380e24c8b7a62 (diff)
parent83eb691b5ea37756cabb1c33a138a3d2701a316c (diff)
parentf3a38594c8a459c7f70d7a62a56f128bc85873b5 (diff)
downloadpackages_apps_nfc-67038a303747888714067d18745573b61206eb1d.zip
packages_apps_nfc-67038a303747888714067d18745573b61206eb1d.tar.gz
packages_apps_nfc-67038a303747888714067d18745573b61206eb1d.tar.bz2
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Id94f334e6a92cf48ac774f1f4233df95d9241274