tree dd60c9acb8cf09d11a0c014653fff5dc7ce80c41
parent 48b6b711a772893ba080d84b6cd3df0e5aa70ee2
parent 3bba8d0457408421a6468f03bbb36e9ff32b81cf
author Martijn Coenen <maco@google.com> 1334952304 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1334952304 -0700

Merge "Added NFC disable during phone shutdown"