tree a5d59b9bdbcc328aa61091a065a522064c7e94b2
parent a1cb462b6949f3f7d3b4abccf9aef9395fe9ea24
parent 9d7ed78e7a981eca109cf745f72c02fac3a4d818
author Jeff Hamilton <jham@android.com> 1311223989 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1311223989 -0700

Merge "Fix crashes when NFC isn't supported."