tree d38dcd9f045f112100192b49f6f881106b2de8f5
parent 059537e7924a5547849b537bf0e50d2f814b80a5
parent 3b6ecf0ec1a6822577450908f46496cbe121202e
author Martijn Coenen <maco@google.com> 1339090515 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339090515 -0700

Merge "Small NFC API docs addition." into jb-dev