tree 9c68bf2192767170cd91fb34eab3217c6e2ebf0b
parent 1733a3de8c4f98ba4df08ab79d1fef6d2684d2c2
parent a5193b24c1c944331f329eca1d4f85df3a024b1d
author Nick Pelly <npelly@google.com> 1321562928 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1321562928 -0800

Merge "Fix NPE on devices that don't have NFC." into ics-mr1