tree d76a4c90ab39ad15d0f5f3a936baaee09ffc12e3
parent 87a61d367f2bb62ff46b1ad40385904ad5ce458e
parent 2ab8e4bbe72ec58d0e70f131cc57b016eb25213b
author Linux Build Service Account <lnxbuild@localhost> 1395198651 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1395198650 -0700

Merge "NFC: if region2 set don't disable NFC on phone shutdown"