tree fae72e29ca72c750755a9004b35458d480d4b32e
parent 9422dbbc8cba16356c5c06c48575b5325eddc227
parent ca95b642c2cc6933ec6cf7241cc68a05fd18eb81
author Martijn Coenen <maco@google.com> 1411705843 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1411705844 +0000

Merge "Manta: NFC: turn off completely on screen off." into lmp-dev