| commit | 1fa578c5df86dc3b0b416c98640f8a06f9bc4f62 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Thu Nov 17 15:12:56 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 17 15:12:56 2011 -0800 |
| tree | 27bbc5d508fc7a2ddaa93dcf8bdc84e0ba691b97 | |
| parent | 98019c135cc261ec7e4e089afdf042d311aba54b [diff] | |
| parent | 637742c34e9db537260bfbd02b461218d2a8f214 [diff] |
am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1 * commit 'c6a0277bca29359ec1aee123495065982d2eea7a': Fix NPE on devices that don't have NFC.