OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17001ce d36d650)
am d36d650a: NFC: async enabling/disabling, ala Bluewooth & Wifi.
authorBrad Fitzpatrick <bradfitz@android.com>
Tue, 19 Oct 2010 00:04:16 +0000 (17:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 Oct 2010 00:04:16 +0000 (17:04 -0700)
Merge commit 'd36d650a8132e8aea375239e6dfff92708771b7a' into gingerbread-plus-aosp

* commit 'd36d650a8132e8aea375239e6dfff92708771b7a':
  NFC: async enabling/disabling, ala Bluewooth & Wifi.


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