tree 295eb06b1215738f9ce49a652274176c3e27e281
parent ceea88578ce53bdee96c561cd5fa5dae725f9a7b
parent e55fe4f3bb19992d8dcfc5cb19528f9a52cdcbb1
author Martijn Coenen <maco@google.com> 1357763318 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1357763324 -0800

Merge "Make NfcAdapter states public and fix build."