diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-19 10:43:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 10:43:43 -0700 |
| commit | 9c8ba9f1af1bf4fc622bec05b32beae8f334513c (patch) | |
| tree | 77929fe8441534c1fa662856c20516983fb415f8 /res | |
| parent | 4453ecaca4cd50bad55a0e217829b0457d3f43a7 (diff) | |
| parent | 4036e768d0909ba947eb205d12d1dd3b23ed492b (diff) | |
| download | packages_apps_settings-9c8ba9f1af1bf4fc622bec05b32beae8f334513c.zip packages_apps_settings-9c8ba9f1af1bf4fc622bec05b32beae8f334513c.tar.gz packages_apps_settings-9c8ba9f1af1bf4fc622bec05b32beae8f334513c.tar.bz2 | |
am 4036e768: am d36d650a: NFC: async enabling/disabling, ala Bluewooth & Wifi.
Merge commit '4036e768d0909ba947eb205d12d1dd3b23ed492b'
* commit '4036e768d0909ba947eb205d12d1dd3b23ed492b':
NFC: async enabling/disabling, ala Bluewooth & Wifi.
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions