tree fa0dbbc4d25a252e0ec19f96361d8ec1fee24e9a
parent 85a3e7c3ab61091c76d31ccbcf52df696fd8542c
parent fe5b542d6bb9f455180f709b5e30579fe1387c7b
author Martijn Coenen <maco@google.com> 1344468215 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1344468215 -0700

Merge "Manta: NFC: Disable low-power tag detect." into jb-mr1-dev