am bd5e37bc: am 0ad13892: Reconcile with ics-factoryrom-2-release

Browse Source

* commit 'bd5e37bc8ca57fd0ef08f8a190c9a97ba69b6f9b':
  Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
  Revert "Merge "Fix WPS pin input UI" into ics-mr0"

...

This commit is contained in:

The Android Open Source Project

2011-11-04 15:03:08 +00:00

committed by Android Git Automerger

parent 27f092147d bd5e37bc8c

commit 2e6d38fee2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available