tree 3214f5b6290ca66229132a95b496aec5b6f073fb
parent ec418d3eae3d10cdc1b9d71f63648ce356722a94
parent 188cddb1d8c89749618401e371a7e7900cb58d6d
author Martijn Coenen <maco@google.com> 1330711987 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330711987 -0800

Merge "Hidden API for setting p2p NFC modes."