OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f11106e 0ad1389)
am 0ad13892: Reconcile with ics-factoryrom-2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 4 Nov 2011 14:59:39 +0000 (14:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Nov 2011 14:59:39 +0000 (14:59 +0000)
* commit '0ad13892c6a0a1d86e0b7dbafd3d4a2c7c82c8d2':
  Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
  Revert "Merge "Fix WPS pin input UI" into ics-mr0"


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help