| commit | 1b4f5d743594971eab9747a84ee21420a8602bbe | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Mon Oct 31 17:02:15 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 31 17:02:15 2011 -0700 |
| tree | c4af533e22a7f81f2b7dbe4b44300aeebc15d230 | |
| parent | 19d9a3d2846c538502003a81522f6d285b9ff24b [diff] | |
| parent | e0eedf7157d0ad2ff1f96548cb082cfb770480ec [diff] |
Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0