| commit | f955d057ddd232af4bd4a74075838dae298c7365 | [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 | 2ca12712ca9cf0c63f643e3f5ce7af55b15a4308 | |
| parent | 85a80ba8cd92fd0a7f7e4a899e772b0f6a50a9d7 [diff] | |
| parent | c6a0277bca29359ec1aee123495065982d2eea7a [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.